From fb4fa5bf1539c2c6fea7bf99fda1d7079f1fd716 Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Wed, 17 Apr 2024 08:57:20 -0700
Subject: [PATCH] Data Containers: add support for String items on all targets,
 where it makes some sense

Previously, it worked on some targets, but not others, due to how ObjectMap is implemented. now checks for String and uses StringMap for those items
---
 src/feathers/controls/ButtonBar.hx     | 54 +++++++++++++++----
 src/feathers/controls/GroupListView.hx | 62 ++++++++++++++++++----
 src/feathers/controls/ListView.hx      | 62 ++++++++++++++++++----
 src/feathers/controls/TabBar.hx        | 49 ++++++++++++++---
 src/feathers/controls/TreeView.hx      | 73 +++++++++++++++++++++-----
 5 files changed, 249 insertions(+), 51 deletions(-)

diff --git a/src/feathers/controls/ButtonBar.hx b/src/feathers/controls/ButtonBar.hx
index 4659275b..61f163de 100644
--- a/src/feathers/controls/ButtonBar.hx
+++ b/src/feathers/controls/ButtonBar.hx
@@ -8,7 +8,6 @@
 
 package feathers.controls;
 
-import feathers.events.FeathersEvent;
 import feathers.controls.dataRenderers.IDataRenderer;
 import feathers.core.FeathersControl;
 import feathers.core.IUIControl;
@@ -17,6 +16,7 @@ import feathers.core.InvalidationFlag;
 import feathers.data.ButtonBarItemState;
 import feathers.data.IFlatCollection;
 import feathers.events.ButtonBarEvent;
+import feathers.events.FeathersEvent;
 import feathers.events.FlatCollectionEvent;
 import feathers.events.TriggerEvent;
 import feathers.layout.ILayout;
@@ -27,6 +27,7 @@ import feathers.skins.IProgrammaticSkin;
 import feathers.utils.AbstractDisplayObjectRecycler;
 import feathers.utils.DisplayObjectRecycler;
 import haxe.ds.ObjectMap;
+import haxe.ds.StringMap;
 import openfl.display.DisplayObject;
 import openfl.errors.IllegalOperationError;
 import openfl.events.Event;
@@ -307,7 +308,8 @@ class ButtonBar extends FeathersControl {
 
 	private var _defaultStorage:ButtonStorage = new ButtonStorage(null, DisplayObjectRecycler.withClass(Button));
 	private var _additionalStorage:Array<ButtonStorage> = null;
-	private var dataToButton = new ObjectMap<Dynamic, Button>();
+	private var objectDataToButton = new ObjectMap<Dynamic, Button>();
+	private var stringDataToButton = new StringMap<Button>();
 	private var buttonToItemState = new ObjectMap<Button, ButtonBarItemState>();
 	private var itemStatePool = new ObjectPool(() -> new ButtonBarItemState());
 	private var _unrenderedData:Array<Dynamic> = [];
@@ -444,7 +446,10 @@ class ButtonBar extends FeathersControl {
 		if (item == null) {
 			return null;
 		}
-		return this.dataToButton.get(item);
+		if ((item is String)) {
+			return this.stringDataToButton.get(cast item);
+		}
+		return this.objectDataToButton.get(item);
 	}
 
 	/**
@@ -459,7 +464,10 @@ class ButtonBar extends FeathersControl {
 			return null;
 		}
 		var item = this._dataProvider.get(index);
-		return this.dataToButton.get(item);
+		if ((item is String)) {
+			return this.stringDataToButton.get(cast item);
+		}
+		return this.objectDataToButton.get(item);
 	}
 
 	/**
@@ -472,9 +480,14 @@ class ButtonBar extends FeathersControl {
 			return null;
 		}
 		var itemState:ButtonBarItemState = null;
-		var tab = this.dataToButton.get(item);
-		if (tab != null) {
-			itemState = this.buttonToItemState.get(tab);
+		var button:Button = null;
+		if ((item is String)) {
+			button = this.stringDataToButton.get(cast item);
+		} else {
+			button = this.objectDataToButton.get(item);
+		}
+		if (button != null) {
+			itemState = this.buttonToItemState.get(button);
 		} else {
 			var index = this._dataProvider.indexOf(item);
 			if (index == -1) {
@@ -682,7 +695,11 @@ class ButtonBar extends FeathersControl {
 			}
 			var item = state.data;
 			this.buttonToItemState.remove(button);
-			this.dataToButton.remove(item);
+			if ((item is String)) {
+				this.stringDataToButton.remove(cast item);
+			} else {
+				this.objectDataToButton.remove(item);
+			}
 			button.removeEventListener(TriggerEvent.TRIGGER, buttonBar_button_triggerHandler);
 			this.resetButton(button, state);
 			this.itemStatePool.release(state);
@@ -790,7 +807,12 @@ class ButtonBar extends FeathersControl {
 		var depthOffset = this._currentBackgroundSkin != null ? 1 : 0;
 		for (i in 0...this._dataProvider.length) {
 			var item = this._dataProvider.get(i);
-			var button = this.dataToButton.get(item);
+			var button:Button = null;
+			if ((item is String)) {
+				button = this.stringDataToButton.get(cast item);
+			} else {
+				button = this.objectDataToButton.get(item);
+			}
 			if (button != null) {
 				var state = this.buttonToItemState.get(button);
 				var changed = this.populateCurrentItemState(item, i, state, this._forceItemStateUpdate);
@@ -852,7 +874,12 @@ class ButtonBar extends FeathersControl {
 		this.updateButton(button, state, storage);
 		button.addEventListener(TriggerEvent.TRIGGER, buttonBar_button_triggerHandler);
 		this.buttonToItemState.set(button, state);
-		this.dataToButton.set(state.data, button);
+		var item = state.data;
+		if ((item is String)) {
+			this.stringDataToButton.set(cast item, button);
+		} else {
+			this.objectDataToButton.set(item, button);
+		}
 		storage.activeButtons.push(button);
 		return button;
 	}
@@ -975,7 +1002,12 @@ class ButtonBar extends FeathersControl {
 
 	private function updateButtonForIndex(index:Int):Void {
 		var item = this._dataProvider.get(index);
-		var button = this.dataToButton.get(item);
+		var button:Button = null;
+		if ((item is String)) {
+			button = this.stringDataToButton.get(cast item);
+		} else {
+			button = this.objectDataToButton.get(item);
+		}
 		if (button == null) {
 			// doesn't exist yet, so we need to do a full invalidation
 			this.setInvalid(DATA);
diff --git a/src/feathers/controls/GroupListView.hx b/src/feathers/controls/GroupListView.hx
index 28ecf862..f0420df6 100644
--- a/src/feathers/controls/GroupListView.hx
+++ b/src/feathers/controls/GroupListView.hx
@@ -36,6 +36,7 @@ import feathers.style.IVariantStyleObject;
 import feathers.utils.AbstractDisplayObjectRecycler;
 import feathers.utils.DisplayObjectRecycler;
 import haxe.ds.ObjectMap;
+import haxe.ds.StringMap;
 import openfl.display.DisplayObject;
 import openfl.errors.ArgumentError;
 import openfl.errors.IllegalOperationError;
@@ -738,7 +739,8 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 	private var _defaultHeaderStorage = new ItemRendererStorage(HEADER, null, DisplayObjectRecycler.withClass(ItemRenderer));
 	private var _additionalItemStorage:Array<ItemRendererStorage> = null;
 	private var _additionalHeaderStorage:Array<ItemRendererStorage> = null;
-	private var dataToItemRenderer = new ObjectMap<Dynamic, DisplayObject>();
+	private var objectDataToItemRenderer = new ObjectMap<Dynamic, DisplayObject>();
+	private var stringDataToItemRenderer = new StringMap<DisplayObject>();
 	private var itemRendererToItemState = new ObjectMap<DisplayObject, GroupListViewItemState>();
 	private var itemStatePool = new ObjectPool(() -> new GroupListViewItemState());
 	private var _unrenderedLocations:Array<Array<Int>> = [];
@@ -933,7 +935,10 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 		if (item == null) {
 			return null;
 		}
-		return this.dataToItemRenderer.get(item);
+		if ((item is String)) {
+			return this.stringDataToItemRenderer.get(cast item);
+		}
+		return this.objectDataToItemRenderer.get(item);
 	}
 
 	/**
@@ -970,7 +975,10 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 			return null;
 		}
 		var item = this._dataProvider.get(location);
-		return this.dataToItemRenderer.get(item);
+		if ((item is String)) {
+			return this.stringDataToItemRenderer.get(cast item);
+		}
+		return this.objectDataToItemRenderer.get(item);
 	}
 
 	/**
@@ -1087,7 +1095,12 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 			return null;
 		}
 		var itemState:GroupListViewItemState = null;
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer != null) {
 			itemState = this.itemRendererToItemState.get(itemRenderer);
 		} else {
@@ -1344,7 +1357,11 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 			}
 			var item = state.data;
 			this.itemRendererToItemState.remove(itemRenderer);
-			this.dataToItemRenderer.remove(item);
+			if ((item is String)) {
+				this.stringDataToItemRenderer.remove(cast item);
+			} else {
+				this.objectDataToItemRenderer.remove(item);
+			}
 			if (storage.type == STANDARD) {
 				itemRenderer.removeEventListener(TriggerEvent.TRIGGER, groupListView_itemRenderer_triggerHandler);
 				itemRenderer.removeEventListener(MouseEvent.CLICK, groupListView_itemRenderer_clickHandler);
@@ -1438,7 +1455,12 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 	}
 
 	private function findItemRenderer(item:Dynamic, location:Array<Int>, layoutIndex:Int):Void {
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer == null) {
 			this._unrenderedLocations.push(location);
 			this._unrenderedLayoutIndices.push(layoutIndex);
@@ -1543,7 +1565,12 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 			itemRenderer.addEventListener(Event.RESIZE, groupListView_itemRenderer_resizeHandler);
 		}
 		this.itemRendererToItemState.set(itemRenderer, state);
-		this.dataToItemRenderer.set(state.data, itemRenderer);
+		var item = state.data;
+		if ((item is String)) {
+			this.stringDataToItemRenderer.set(cast item, itemRenderer);
+		} else {
+			this.objectDataToItemRenderer.set(item, itemRenderer);
+		}
 		storage.activeItemRenderers.push(itemRenderer);
 		return itemRenderer;
 	}
@@ -1970,7 +1997,12 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 			targetY = result.y;
 		} else {
 			var item = this._dataProvider.get(location);
-			var itemRenderer = this.dataToItemRenderer.get(item);
+			var itemRenderer:DisplayObject = null;
+			if ((item is String)) {
+				itemRenderer = this.stringDataToItemRenderer.get(cast item);
+			} else {
+				itemRenderer = this.objectDataToItemRenderer.get(item);
+			}
 			if (itemRenderer == null) {
 				return;
 			}
@@ -2026,7 +2058,12 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 		}
 		if (event.keyCode == Keyboard.SPACE || event.keyCode == Keyboard.ENTER) {
 			if (this._selectedItem != null) {
-				var itemRenderer = this.dataToItemRenderer.get(this._selectedItem);
+				var itemRenderer:DisplayObject = null;
+				if ((this._selectedItem is String)) {
+					itemRenderer = this.stringDataToItemRenderer.get(cast this._selectedItem);
+				} else {
+					itemRenderer = this.objectDataToItemRenderer.get(this._selectedItem);
+				}
 				var state:GroupListViewItemState = null;
 				if (itemRenderer != null) {
 					state = this.itemRendererToItemState.get(itemRenderer);
@@ -2206,7 +2243,12 @@ class GroupListView extends BaseScrollContainer implements IDataSelector<Dynamic
 		}
 		var item = this._dataProvider.get(location);
 		var type = location.length == 1 ? HEADER : STANDARD;
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer == null) {
 			// doesn't exist yet, so we need to do a full invalidation
 			this.setInvalid(DATA);
diff --git a/src/feathers/controls/ListView.hx b/src/feathers/controls/ListView.hx
index ac802677..f6f85b17 100644
--- a/src/feathers/controls/ListView.hx
+++ b/src/feathers/controls/ListView.hx
@@ -42,6 +42,7 @@ import feathers.style.IVariantStyleObject;
 import feathers.utils.AbstractDisplayObjectRecycler;
 import feathers.utils.DisplayObjectRecycler;
 import haxe.ds.ObjectMap;
+import haxe.ds.StringMap;
 import openfl.Lib;
 import openfl.display.DisplayObject;
 import openfl.display.Stage;
@@ -763,7 +764,8 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 
 	private var _defaultStorage = new ItemRendererStorage(null, DisplayObjectRecycler.withClass(ItemRenderer));
 	private var _additionalStorage:Array<ItemRendererStorage> = null;
-	private var dataToItemRenderer = new ObjectMap<Dynamic, DisplayObject>();
+	private var objectDataToItemRenderer = new ObjectMap<Dynamic, DisplayObject>();
+	private var stringDataToItemRenderer = new StringMap<DisplayObject>();
 	private var itemRendererToItemState = new ObjectMap<DisplayObject, ListViewItemState>();
 	private var itemStatePool = new ObjectPool(() -> new ListViewItemState());
 	private var _unrenderedData:Array<Dynamic> = [];
@@ -1133,7 +1135,10 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 		if (item == null) {
 			return null;
 		}
-		return this.dataToItemRenderer.get(item);
+		if ((item is String)) {
+			return this.stringDataToItemRenderer.get(cast item);
+		}
+		return this.objectDataToItemRenderer.get(item);
 	}
 
 	/**
@@ -1170,7 +1175,10 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 			return null;
 		}
 		var item = this._dataProvider.get(index);
-		return this.dataToItemRenderer.get(item);
+		if ((item is String)) {
+			return this.stringDataToItemRenderer.get(cast item);
+		}
+		return this.objectDataToItemRenderer.get(item);
 	}
 
 	/**
@@ -1224,7 +1232,12 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 			return null;
 		}
 		var itemState:ListViewItemState = null;
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer != null) {
 			itemState = this.itemRendererToItemState.get(itemRenderer);
 		} else {
@@ -1423,7 +1436,11 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 			}
 			var item = state.data;
 			this.itemRendererToItemState.remove(itemRenderer);
-			this.dataToItemRenderer.remove(item);
+			if ((item is String)) {
+				this.stringDataToItemRenderer.remove(cast item);
+			} else {
+				this.objectDataToItemRenderer.remove(item);
+			}
 			itemRenderer.removeEventListener(TriggerEvent.TRIGGER, listView_itemRenderer_triggerHandler);
 			itemRenderer.removeEventListener(MouseEvent.CLICK, listView_itemRenderer_clickHandler);
 			itemRenderer.removeEventListener(TouchEvent.TOUCH_TAP, listView_itemRenderer_touchTapHandler);
@@ -1482,7 +1499,12 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 		}
 		for (i in this._visibleIndices.start...this._visibleIndices.end + 1) {
 			var item = this._dataProvider.get(i);
-			var itemRenderer = this.dataToItemRenderer.get(item);
+			var itemRenderer:DisplayObject = null;
+			if ((item is String)) {
+				itemRenderer = this.stringDataToItemRenderer.get(cast item);
+			} else {
+				itemRenderer = this.objectDataToItemRenderer.get(item);
+			}
 			if (itemRenderer != null) {
 				var state = this.itemRendererToItemState.get(itemRenderer);
 				var changed = this.populateCurrentItemState(item, i, state, this._forceItemStateUpdate);
@@ -1656,7 +1678,12 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 		}
 		itemRenderer.addEventListener(MouseEvent.MOUSE_DOWN, listView_itemRenderer_mouseDownHandler);
 		this.itemRendererToItemState.set(itemRenderer, state);
-		this.dataToItemRenderer.set(state.data, itemRenderer);
+		var item = state.data;
+		if ((item is String)) {
+			this.stringDataToItemRenderer.set(cast item, itemRenderer);
+		} else {
+			this.objectDataToItemRenderer.set(state.data, itemRenderer);
+		}
 		storage.activeItemRenderers.push(itemRenderer);
 		return itemRenderer;
 	}
@@ -1784,7 +1811,12 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 			targetY = result.y;
 		} else {
 			var item = this._dataProvider.get(index);
-			var itemRenderer = this.dataToItemRenderer.get(item);
+			var itemRenderer:DisplayObject = null;
+			if ((item is String)) {
+				itemRenderer = this.stringDataToItemRenderer.get(cast item);
+			} else {
+				itemRenderer = this.objectDataToItemRenderer.get(item);
+			}
 			if (itemRenderer == null) {
 				return;
 			}
@@ -2260,7 +2292,12 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 			this._virtualCache[index] = null;
 		}
 		var item = this._dataProvider.get(index);
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer == null) {
 			// doesn't exist yet, so we need to do a full invalidation
 			this.setInvalid(DATA);
@@ -2397,7 +2434,12 @@ class ListView extends BaseScrollContainer implements IIndexSelector implements
 		}
 		if (event.keyCode == Keyboard.SPACE || event.keyCode == Keyboard.ENTER) {
 			if (this._selectedItem != null) {
-				var itemRenderer = this.dataToItemRenderer.get(this._selectedItem);
+				var itemRenderer:DisplayObject = null;
+				if ((this._selectedItem is String)) {
+					itemRenderer = this.stringDataToItemRenderer.get(cast this._selectedItem);
+				} else {
+					itemRenderer = this.objectDataToItemRenderer.get(this._selectedItem);
+				}
 				var state:ListViewItemState = null;
 				if (itemRenderer != null) {
 					state = this.itemRendererToItemState.get(itemRenderer);
diff --git a/src/feathers/controls/TabBar.hx b/src/feathers/controls/TabBar.hx
index 331b8c40..a39bbc6e 100644
--- a/src/feathers/controls/TabBar.hx
+++ b/src/feathers/controls/TabBar.hx
@@ -30,6 +30,7 @@ import feathers.skins.IProgrammaticSkin;
 import feathers.utils.AbstractDisplayObjectRecycler;
 import feathers.utils.DisplayObjectRecycler;
 import haxe.ds.ObjectMap;
+import haxe.ds.StringMap;
 import openfl.display.DisplayObject;
 import openfl.errors.IllegalOperationError;
 import openfl.events.Event;
@@ -432,7 +433,8 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 
 	private var _defaultStorage:TabStorage = new TabStorage(null, DisplayObjectRecycler.withClass(ToggleButton));
 	private var _additionalStorage:Array<TabStorage> = null;
-	private var dataToTab = new ObjectMap<Dynamic, ToggleButton>();
+	private var objectDataToTab = new ObjectMap<Dynamic, ToggleButton>();
+	private var stringDataToTab = new StringMap<ToggleButton>();
 	private var tabToItemState = new ObjectMap<ToggleButton, TabBarItemState>();
 	private var itemStatePool = new ObjectPool(() -> new TabBarItemState());
 	private var _unrenderedData:Array<Dynamic> = [];
@@ -569,7 +571,10 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 		if (item == null) {
 			return null;
 		}
-		return this.dataToTab.get(item);
+		if ((item is String)) {
+			return this.stringDataToTab.get(cast item);
+		}
+		return this.objectDataToTab.get(item);
 	}
 
 	/**
@@ -584,7 +589,10 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 			return null;
 		}
 		var item = this._dataProvider.get(index);
-		return this.dataToTab.get(item);
+		if ((item is String)) {
+			return this.stringDataToTab.get(cast item);
+		}
+		return this.objectDataToTab.get(item);
 	}
 
 	/**
@@ -597,7 +605,12 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 			return null;
 		}
 		var itemState:TabBarItemState = null;
-		var tab = this.dataToTab.get(item);
+		var tab:ToggleButton = null;
+		if ((item is String)) {
+			tab = this.stringDataToTab.get(cast item);
+		} else {
+			tab = this.objectDataToTab.get(item);
+		}
 		if (tab != null) {
 			itemState = this.tabToItemState.get(tab);
 		} else {
@@ -811,7 +824,11 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 			}
 			var item = state.data;
 			this.tabToItemState.remove(tab);
-			this.dataToTab.remove(item);
+			if ((item is String)) {
+				this.stringDataToTab.remove(cast item);
+			} else {
+				this.objectDataToTab.remove(item);
+			}
 			tab.removeEventListener(TriggerEvent.TRIGGER, tabBar_tab_triggerHandler);
 			tab.removeEventListener(Event.CHANGE, tabBar_tab_changeHandler);
 			this.resetTab(tab, state);
@@ -920,7 +937,12 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 		var depthOffset = this._currentBackgroundSkin != null ? 1 : 0;
 		for (i in 0...this._dataProvider.length) {
 			var item = this._dataProvider.get(i);
-			var tab = this.dataToTab.get(item);
+			var tab:ToggleButton = null;
+			if ((item is String)) {
+				tab = this.stringDataToTab.get(cast item);
+			} else {
+				tab = this.objectDataToTab.get(item);
+			}
 			if (tab != null) {
 				var state = this.tabToItemState.get(tab);
 				var changed = this.populateCurrentItemState(item, i, state, this._forceItemStateUpdate);
@@ -983,7 +1005,13 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 		tab.addEventListener(TriggerEvent.TRIGGER, tabBar_tab_triggerHandler);
 		tab.addEventListener(Event.CHANGE, tabBar_tab_changeHandler);
 		this.tabToItemState.set(tab, state);
-		this.dataToTab.set(state.data, tab);
+		var item = state.data;
+		if ((item is String)) {
+			this.stringDataToTab.set(cast item, tab);
+		} else {
+			this.objectDataToTab.set(item, tab);
+		}
+
 		storage.activeTabs.push(tab);
 		return tab;
 	}
@@ -1248,7 +1276,12 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 
 	private function updateTabForIndex(index:Int):Void {
 		var item = this._dataProvider.get(index);
-		var tab = this.dataToTab.get(item);
+		var tab:ToggleButton = null;
+		if ((item is String)) {
+			tab = this.stringDataToTab.get(cast item);
+		} else {
+			tab = this.objectDataToTab.get(item);
+		}
 		if (tab == null) {
 			// doesn't exist yet, so we need to do a full invalidation
 			this.setInvalid(DATA);
diff --git a/src/feathers/controls/TreeView.hx b/src/feathers/controls/TreeView.hx
index 6251b0ba..a651c6c2 100644
--- a/src/feathers/controls/TreeView.hx
+++ b/src/feathers/controls/TreeView.hx
@@ -8,7 +8,6 @@
 
 package feathers.controls;
 
-import openfl.text.TextField;
 import feathers.controls.dataRenderers.HierarchicalItemRenderer;
 import feathers.controls.dataRenderers.IDataRenderer;
 import feathers.controls.dataRenderers.IHierarchicalDepthItemRenderer;
@@ -39,6 +38,7 @@ import feathers.style.IVariantStyleObject;
 import feathers.utils.AbstractDisplayObjectRecycler;
 import feathers.utils.DisplayObjectRecycler;
 import haxe.ds.ObjectMap;
+import haxe.ds.StringMap;
 import openfl.display.DisplayObject;
 import openfl.errors.ArgumentError;
 import openfl.errors.IllegalOperationError;
@@ -46,6 +46,7 @@ import openfl.events.Event;
 import openfl.events.KeyboardEvent;
 import openfl.events.MouseEvent;
 import openfl.events.TouchEvent;
+import openfl.text.TextField;
 import openfl.ui.Keyboard;
 #if air
 import openfl.ui.Multitouch;
@@ -652,7 +653,8 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 
 	private var _defaultStorage = new ItemRendererStorage(null, DisplayObjectRecycler.withClass(HierarchicalItemRenderer));
 	private var _additionalStorage:Array<ItemRendererStorage> = null;
-	private var dataToItemRenderer = new ObjectMap<Dynamic, DisplayObject>();
+	private var objectDataToItemRenderer = new ObjectMap<Dynamic, DisplayObject>();
+	private var stringDataToItemRenderer = new StringMap<DisplayObject>();
 	private var itemRendererToItemState = new ObjectMap<DisplayObject, TreeViewItemState>();
 	private var itemStatePool = new ObjectPool(() -> new TreeViewItemState());
 	private var _unrenderedLocations:Array<Array<Int>> = [];
@@ -879,7 +881,10 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 		if (item == null) {
 			return null;
 		}
-		return this.dataToItemRenderer.get(item);
+		if ((item is String)) {
+			return this.stringDataToItemRenderer.get(cast item);
+		}
+		return this.objectDataToItemRenderer.get(item);
 	}
 
 	/**
@@ -916,7 +921,10 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 			return null;
 		}
 		var item = this._dataProvider.get(location);
-		return this.dataToItemRenderer.get(item);
+		if ((item is String)) {
+			return this.stringDataToItemRenderer.get(cast item);
+		}
+		return this.objectDataToItemRenderer.get(item);
 	}
 
 	/**
@@ -989,7 +997,12 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 			return null;
 		}
 		var itemState:TreeViewItemState = null;
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer != null) {
 			itemState = this.itemRendererToItemState.get(itemRenderer);
 		} else {
@@ -1187,7 +1200,11 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 			}
 			var item = state.data;
 			this.itemRendererToItemState.remove(itemRenderer);
-			this.dataToItemRenderer.remove(item);
+			if ((item is String)) {
+				this.stringDataToItemRenderer.remove(cast item);
+			} else {
+				this.objectDataToItemRenderer.remove(item);
+			}
 			itemRenderer.removeEventListener(TriggerEvent.TRIGGER, treeView_itemRenderer_triggerHandler);
 			itemRenderer.removeEventListener(MouseEvent.CLICK, treeView_itemRenderer_clickHandler);
 			itemRenderer.removeEventListener(TouchEvent.TOUCH_TAP, treeView_itemRenderer_touchTapHandler);
@@ -1273,7 +1290,12 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 	}
 
 	private function findItemRenderer(item:Dynamic, location:Array<Int>, layoutIndex:Int):Void {
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer == null) {
 			this._unrenderedLocations.push(location);
 			this._unrenderedLayoutIndices.push(layoutIndex);
@@ -1487,7 +1509,12 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 			itemRenderer.addEventListener(Event.CLOSE, treeView_itemRenderer_closeHandler);
 		}
 		this.itemRendererToItemState.set(itemRenderer, state);
-		this.dataToItemRenderer.set(state.data, itemRenderer);
+		var item = state.data;
+		if ((item is String)) {
+			this.stringDataToItemRenderer.set(cast item, itemRenderer);
+		} else {
+			this.objectDataToItemRenderer.set(item, itemRenderer);
+		}
 		storage.activeItemRenderers.push(itemRenderer);
 		return itemRenderer;
 	}
@@ -1806,7 +1833,12 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 			targetY = result.y;
 		} else {
 			var item = this._dataProvider.get(location);
-			var itemRenderer = this.dataToItemRenderer.get(item);
+			var itemRenderer:DisplayObject = null;
+			if ((item is String)) {
+				itemRenderer = this.stringDataToItemRenderer.get(cast item);
+			} else {
+				itemRenderer = this.objectDataToItemRenderer.get(item);
+			}
 			if (itemRenderer == null) {
 				return;
 			}
@@ -1882,7 +1914,12 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 		}
 		if (event.keyCode == Keyboard.ENTER) {
 			if (this._selectedItem != null) {
-				var itemRenderer = this.dataToItemRenderer.get(this._selectedItem);
+				var itemRenderer:DisplayObject = null;
+				if ((this._selectedItem is String)) {
+					itemRenderer = this.stringDataToItemRenderer.get(cast this._selectedItem);
+				} else {
+					itemRenderer = this.objectDataToItemRenderer.get(this._selectedItem);
+				}
 				var state:TreeViewItemState = null;
 				if (itemRenderer != null) {
 					state = this.itemRendererToItemState.get(itemRenderer);
@@ -1927,7 +1964,14 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 	}
 
 	private function toggleBranchInternal(branch:Dynamic, location:Array<Int>, layoutIndex:Int, open:Bool):Int {
-		var itemRenderer = this.dataToItemRenderer.get(branch);
+		var itemRenderer:DisplayObject = null;
+		if ((branch is String)) {
+			// a branch can't really be a string, but let's be consistent in how
+			// we look up item renderers
+			itemRenderer = this.stringDataToItemRenderer.get(cast branch);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(branch);
+		}
 		var state:TreeViewItemState = null;
 		if (itemRenderer != null) {
 			state = this.itemRendererToItemState.get(itemRenderer);
@@ -2201,7 +2245,12 @@ class TreeView extends BaseScrollContainer implements IDataSelector<Dynamic> imp
 			this._virtualCache[layoutIndex] = null;
 		}
 		var item = this._dataProvider.get(location);
-		var itemRenderer = this.dataToItemRenderer.get(item);
+		var itemRenderer:DisplayObject = null;
+		if ((item is String)) {
+			itemRenderer = this.stringDataToItemRenderer.get(cast item);
+		} else {
+			itemRenderer = this.objectDataToItemRenderer.get(item);
+		}
 		if (itemRenderer == null) {
 			// doesn't exist yet, so we need to do a full invalidation
 			this.setInvalid(DATA);