don't force top align editbox placeholder label (cocos#11303)

* dont force top align editbox placeholder label * no need to update placeholder style * optimize code
QWER2509 · Jun 10, 2022 · ea38500 · ea38500
1 parent 78dfe5b
commit ea38500
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/cocos/ui/editbox/edit-box-impl.ts b/cocos/ui/editbox/edit-box-impl.ts
@@ -461,10 +461,11 @@ export class EditBoxImpl extends EditBoxImplBase {
         const elem = this._edTxt;
         if (elem && delegate) {
             elem.value = delegate.string;
-            elem.placeholder = delegate.placeholder;
-
             this._updateTextLabel(delegate.textLabel);
-            this._updatePlaceholderLabel(delegate.placeholderLabel);
+
+            // NOTE: we don't show placeholder any more when editBox is editing
+            // elem.placeholder = delegate.placeholder;
+            // this._updatePlaceholderLabel(delegate.placeholderLabel);
         }
     }
 

diff --git a/cocos/ui/editbox/edit-box.ts b/cocos/ui/editbox/edit-box.ts
@@ -617,7 +617,6 @@ export class EditBox extends Component {
         const transform = this._placeholderLabel!.node._uiProps.uiTransformComp;
         transform!.setAnchorPoint(0, 1);
         if (this._inputMode === InputMode.ANY) {
-            placeholderLabel.verticalAlign = VerticalTextAlignment.TOP;
             placeholderLabel.enableWrapText = true;
         } else {
             placeholderLabel.enableWrapText = false;
@@ -737,9 +736,6 @@ export class EditBox extends Component {
             placeholderLabel.node._uiProps.uiTransformComp!.setContentSize(size.width - LEFT_PADDING, size.height);
             placeholderLabel.lineHeight = size.height;
             placeholderLabel.node.setPosition(offX + LEFT_PADDING, offY + size.height, placeholderLabel.node.position.z);
-            if (this._inputMode === InputMode.ANY) {
-                placeholderLabel.verticalAlign = VerticalTextAlignment.TOP;
-            }
             placeholderLabel.enableWrapText = this._inputMode === InputMode.ANY;
         }
     }