chore: cleanup

NathanWalker · NathanWalker · commit 8bb0dc2ef288 · 2025-11-01T08:32:16.000-07:00
diff --git a/packages/core/ui/search-bar/index.android.ts b/packages/core/ui/search-bar/index.android.ts
@@ -275,7 +275,7 @@ export class SearchBar extends SearchBarBase {
 		textView.setHintTextColor(color);
 	}
 	[clearButtonColorProperty.setNative](value: Color) {
-		if (!this.nativeViewProtected) {
+		if (!this.nativeViewProtected || !value) {
 			return;
 		}
 
@@ -284,8 +284,10 @@ export class SearchBar extends SearchBarBase {
 			const closeButtonId = this.nativeViewProtected.getContext().getResources().getIdentifier('android:id/search_close_btn', null, null);
 			const closeButton = this.nativeViewProtected.findViewById(closeButtonId) as android.widget.ImageView;
 
-			if (closeButton && value) {
-				closeButton.setColorFilter(value.android);
+			const color = value instanceof Color ? value.android : new Color(value).android;
+
+			if (closeButton) {
+				closeButton.setColorFilter(color);
 			}
 		} catch (err) {
 			console.log('Error setting clear button color:', err);
diff --git a/packages/core/ui/search-bar/index.d.ts b/packages/core/ui/search-bar/index.d.ts
@@ -61,6 +61,13 @@ export class SearchBar extends View {
 	 */
 	textFieldHintColor: Color;
 
+	/**
+	 * Gets or sets the Clear Button color of the SearchBar component.
+	 *
+	 * @nsProperty
+	 */
+	clearButtonColor: Color | string;
+
 	/**
 	 * Adds a listener for the specified event name.
 	 *
diff --git a/packages/core/ui/search-bar/index.ios.ts b/packages/core/ui/search-bar/index.ios.ts
@@ -222,11 +222,11 @@ export class SearchBar extends SearchBarBase {
 	}
 	[clearButtonColorProperty.setNative](value: Color | UIColor) {
 		const textField = this._getTextField();
+		if (!textField) return;
 		// Check if clear button is available in the text field
-		if (textField && textField.valueForKey('clearButton')) {
-			const button = textField.valueForKey('clearButton');
-			const color = value instanceof Color ? value.ios : value;
-			button.tintColor = color;
-		}
+		const clearButton = textField.valueForKey('clearButton');
+		if (!clearButton) return;
+
+		clearButton.tintColor = value instanceof Color ? value.ios : value;
 	}
 }
diff --git a/packages/core/ui/search-bar/search-bar-common.ts b/packages/core/ui/search-bar/search-bar-common.ts
@@ -12,6 +12,7 @@ export abstract class SearchBarBase extends View implements SearchBarDefinition
 	public hint: string;
 	public textFieldBackgroundColor: Color;
 	public textFieldHintColor: Color;
+	public clearButtonColor: Color | string;
 
 	public abstract dismissSoftInput();
 }

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ export class SearchBar extends SearchBarBase {`
`275`	`275`	`textView.setHintTextColor(color);`
`276`	`276`	`}`
`277`	`277`	`[clearButtonColorProperty.setNative](value: Color) {`
`278`		`- if (!this.nativeViewProtected) {`
	`278`	`+ if (!this.nativeViewProtected \|\| !value) {`
`279`	`279`	`return;`
`280`	`280`	`}`
`281`	`281`
`@@ -284,8 +284,10 @@ export class SearchBar extends SearchBarBase {`
`284`	`284`	`const closeButtonId = this.nativeViewProtected.getContext().getResources().getIdentifier('android:id/search_close_btn', null, null);`
`285`	`285`	`const closeButton = this.nativeViewProtected.findViewById(closeButtonId) as android.widget.ImageView;`
`286`	`286`
`287`		`- if (closeButton && value) {`
`288`		`- closeButton.setColorFilter(value.android);`
	`287`	`+ const color = value instanceof Color ? value.android : new Color(value).android;`
	`288`	`+`
	`289`	`+ if (closeButton) {`
	`290`	`+ closeButton.setColorFilter(color);`
`289`	`291`	`}`
`290`	`292`	`} catch (err) {`
`291`	`293`	`console.log('Error setting clear button color:', err);`
Original file line number	Diff line number	Diff line change
`@@ -222,11 +222,11 @@ export class SearchBar extends SearchBarBase {`
`222`	`222`	`}`
`223`	`223`	`[clearButtonColorProperty.setNative](value: Color \| UIColor) {`
`224`	`224`	`const textField = this._getTextField();`
	`225`	`+ if (!textField) return;`
`225`	`226`	`// Check if clear button is available in the text field`
`226`		`- if (textField && textField.valueForKey('clearButton')) {`
`227`		`- const button = textField.valueForKey('clearButton');`
`228`		`- const color = value instanceof Color ? value.ios : value;`
`229`		`- button.tintColor = color;`
`230`		`- }`
	`227`	`+ const clearButton = textField.valueForKey('clearButton');`
	`228`	`+ if (!clearButton) return;`
	`229`	`+`
	`230`	`+ clearButton.tintColor = value instanceof Color ? value.ios : value;`
`231`	`231`	`}`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ export abstract class SearchBarBase extends View implements SearchBarDefinition`
`12`	`12`	`public hint: string;`
`13`	`13`	`public textFieldBackgroundColor: Color;`
`14`	`14`	`public textFieldHintColor: Color;`
	`15`	`+ public clearButtonColor: Color \| string;`
`15`	`16`
`16`	`17`	`public abstract dismissSoftInput();`
`17`	`18`	`}`