PageNavigator, TabNavigator: Haxe 4.0 back compat

feathersui · Oct 24, 2024 · 416ee14 · 416ee14
1 parent 9ff22be
commit 416ee14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/feathers/controls/navigators/PageNavigator.hx b/src/feathers/controls/navigators/PageNavigator.hx
@@ -70,7 +70,7 @@ class PageNavigator extends BaseNavigator implements IIndexSelector implements I
 	private static final defaultPageIndicatorFactory = DisplayObjectFactory.withClass(PageIndicator);
 
 	private static final NO_PENDING_SELECTED_INDEX:Int = -2;
-	private static final NO_PENDING_SELECTED_ITEM:{} = {};
+	private static final NO_PENDING_SELECTED_ITEM:Any = {};
 
 	/**
 		Creates a new `PageNavigator` object.
@@ -219,9 +219,12 @@ class PageNavigator extends BaseNavigator implements IIndexSelector implements I
 	}
 
 	private function set_selectedItem(value:#if flash Dynamic #else PageItem #end):#if flash Dynamic #else PageItem #end {
-		var currentSelectedItem = this._pendingSelectedItem != NO_PENDING_SELECTED_ITEM ? this._pendingSelectedItem : this._selectedItem;
+		var currentSelectedItem:Any = this._pendingSelectedItem;
+		if (currentSelectedItem == NO_PENDING_SELECTED_ITEM) {
+			currentSelectedItem = this._selectedItem;
+		}
 		if (currentSelectedItem == value) {
-			return currentSelectedItem;
+			return cast(currentSelectedItem, PageItem);
 		}
 		this._pendingSelectedItem = value;
 		this._pendingSelectedIndex = NO_PENDING_SELECTED_INDEX;

diff --git a/src/feathers/controls/navigators/TabNavigator.hx b/src/feathers/controls/navigators/TabNavigator.hx
@@ -71,7 +71,7 @@ class TabNavigator extends BaseNavigator implements IIndexSelector implements ID
 	private static final defaultTabBarFactory = DisplayObjectFactory.withClass(TabBar);
 
 	private static final NO_PENDING_SELECTED_INDEX:Int = -2;
-	private static final NO_PENDING_SELECTED_ITEM:{} = {};
+	private static final NO_PENDING_SELECTED_ITEM:Any = {};
 
 	/**
 		Creates a new `TabNavigator` object.
@@ -220,9 +220,12 @@ class TabNavigator extends BaseNavigator implements IIndexSelector implements ID
 	}
 
 	private function set_selectedItem(value:#if flash Dynamic #else TabItem #end):#if flash Dynamic #else TabItem #end {
-		var currentSelectedItem = this._pendingSelectedItem != NO_PENDING_SELECTED_ITEM ? this._pendingSelectedItem : this._selectedItem;
+		var currentSelectedItem:Any = this._pendingSelectedItem;
+		if (currentSelectedItem == NO_PENDING_SELECTED_ITEM) {
+			currentSelectedItem = this._selectedItem;
+		}
 		if (currentSelectedItem == value) {
-			return currentSelectedItem;
+			return cast(currentSelectedItem, TabItem);
 		}
 		this._pendingSelectedItem = value;
 		this._pendingSelectedIndex = NO_PENDING_SELECTED_INDEX;