TextArea, TextInput: prompt uses disabled text input, if available an…

…d component is disabled
feathersui · Feb 22, 2024 · 3a093e5 · 3a093e5
1 parent 6401312
commit 3a093e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/feathers/controls/TextArea.hx b/src/feathers/controls/TextArea.hx
@@ -1075,6 +1075,9 @@ class TextArea extends BaseScrollContainer implements IStateContext<TextInputSta
 
 	private function getCurrentPromptTextFormat():TextFormat {
 		var textFormat = this.promptTextFormat;
+		if (!this._enabled && this.disabledTextFormat != null) {
+			textFormat = this.disabledTextFormat;
+		}
 		if (textFormat == null) {
 			textFormat = this.textFormat;
 		}

diff --git a/src/feathers/controls/TextInput.hx b/src/feathers/controls/TextInput.hx
@@ -1627,6 +1627,9 @@ class TextInput extends FeathersControl implements IStateContext<TextInputState>
 
 	private function getCurrentPromptTextFormat():TextFormat {
 		var textFormat = this.promptTextFormat;
+		if (!this._enabled && this.disabledTextFormat != null) {
+			textFormat = this.disabledTextFormat;
+		}
 		if (textFormat == null) {
 			textFormat = this.textFormat;
 		}