refactor: update components to use new text-field

vaadin · Sep 24, 2021 · 4ea300a · 4ea300a
1 parent 8a824ff
commit 4ea300a
Show file tree

Hide file tree

Showing 42 changed files with 88 additions and 85 deletions.
diff --git a/packages/crud/package.json b/packages/crud/package.json
@@ -30,13 +30,13 @@
     "@vaadin/button": "^22.0.0-alpha6",
     "@vaadin/component-base": "^22.0.0-alpha6",
     "@vaadin/confirm-dialog": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-dialog": "^22.0.0-alpha6",
     "@vaadin/vaadin-form-layout": "^22.0.0-alpha6",
     "@vaadin/vaadin-grid": "^22.0.0-alpha6",
     "@vaadin/vaadin-license-checker": "^2.1.0",
     "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6"
   },
   "devDependencies": {

diff --git a/packages/crud/src/vaadin-crud-form.js b/packages/crud/src/vaadin-crud-form.js
@@ -4,7 +4,7 @@
  * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
  */
 import { FormLayoutElement } from '@vaadin/vaadin-form-layout/src/vaadin-form-layout.js';
-import '@vaadin/vaadin-text-field/src/vaadin-text-field.js';
+import '@vaadin/text-field/src/vaadin-text-field.js';
 import { IncludedMixin } from './vaadin-crud-include-mixin.js';
 
 /**

diff --git a/packages/crud/theme/lumo/vaadin-crud.js b/packages/crud/theme/lumo/vaadin-crud.js
@@ -1,7 +1,7 @@
 import '@vaadin/vaadin-grid/theme/lumo/vaadin-grid.js';
 import '@vaadin/button/theme/lumo/vaadin-button.js';
 import '@vaadin/vaadin-form-layout/theme/lumo/vaadin-form-layout.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import '@vaadin/vaadin-dialog/theme/lumo/vaadin-dialog.js';
 import '@vaadin/confirm-dialog/theme/lumo/vaadin-confirm-dialog.js';
 import '@vaadin/vaadin-grid/theme/lumo/vaadin-grid-sorter.js';

diff --git a/packages/crud/theme/material/vaadin-crud.js b/packages/crud/theme/material/vaadin-crud.js
@@ -1,7 +1,7 @@
 import '@vaadin/vaadin-grid/theme/material/vaadin-grid.js';
 import '@vaadin/button/theme/material/vaadin-button.js';
 import '@vaadin/vaadin-form-layout/theme/material/vaadin-form-layout.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import '@vaadin/vaadin-dialog/theme/material/vaadin-dialog.js';
 import '@vaadin/confirm-dialog/theme/material/vaadin-confirm-dialog.js';
 import '@vaadin/vaadin-grid/theme/material/vaadin-grid-sorter.js';

diff --git a/packages/custom-field/test/visual/lumo/custom-field.test.js b/packages/custom-field/test/visual/lumo/custom-field.test.js
@@ -9,9 +9,9 @@ import '@vaadin/vaadin-form-layout/theme/lumo/vaadin-form-layout.js';
 import '@vaadin/vaadin-list-box/theme/lumo/vaadin-list-box.js';
 import '@vaadin/select/theme/lumo/vaadin-select.js';
 import '@vaadin/email-field/theme/lumo/vaadin-email-field.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-number-field.js';
+import '@vaadin/number-field/theme/lumo/vaadin-number-field.js';
 import '@vaadin/text-area/theme/lumo/vaadin-text-area.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import '@vaadin/password-field/theme/lumo/vaadin-password-field.js';
 import '@vaadin/vaadin-time-picker/theme/lumo/vaadin-time-picker.js';
 import '../../../theme/lumo/vaadin-custom-field.js';

diff --git a/packages/custom-field/test/visual/material/custom-field.test.js b/packages/custom-field/test/visual/material/custom-field.test.js
@@ -9,9 +9,9 @@ import '@vaadin/vaadin-form-layout/theme/material/vaadin-form-layout.js';
 import '@vaadin/vaadin-list-box/theme/material/vaadin-list-box.js';
 import '@vaadin/select/theme/material/vaadin-select.js';
 import '@vaadin/email-field/theme/material/vaadin-email-field.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-number-field.js';
+import '@vaadin/number-field/theme/material/vaadin-number-field.js';
 import '@vaadin/text-area/theme/material/vaadin-text-area.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import '@vaadin/password-field/theme/material/vaadin-password-field.js';
 import '@vaadin/vaadin-time-picker/theme/material/vaadin-time-picker.js';
 import '../../../theme/material/vaadin-custom-field.js';

diff --git a/packages/message-input/package.json b/packages/message-input/package.json
@@ -26,13 +26,11 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/avatar": "^22.0.0-alpha6",
     "@vaadin/button": "^22.0.0-alpha6",
     "@vaadin/component-base": "^22.0.0-alpha6",
     "@vaadin/text-area": "^22.0.0-alpha6",
     "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6"
   },
   "devDependencies": {

diff --git a/packages/message-list/package.json b/packages/message-list/package.json
@@ -29,12 +29,9 @@
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
     "@vaadin/avatar": "^22.0.0-alpha6",
-    "@vaadin/button": "^22.0.0-alpha6",
     "@vaadin/component-base": "^22.0.0-alpha6",
-    "@vaadin/text-area": "^22.0.0-alpha6",
     "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6"
   },
   "devDependencies": {

diff --git a/packages/vaadin-combo-box/package.json b/packages/vaadin-combo-box/package.json
@@ -42,9 +42,9 @@
     "@polymer/iron-input": "^3.0.1",
     "@polymer/paper-input": "^3.0.0",
     "@vaadin/testing-helpers": "^0.3.0",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-dialog": "^22.0.0-alpha6",
     "@vaadin/vaadin-template-renderer": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },

diff --git a/packages/vaadin-combo-box/test/combo-box-light.test.js b/packages/vaadin-combo-box/test/combo-box-light.test.js
@@ -17,7 +17,7 @@ import { resetMouseCanceller } from '@polymer/polymer/lib/utils/gestures.js';
 import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
 import '@polymer/iron-input/iron-input.js';
 import '@polymer/paper-input/paper-input.js';
-import '@vaadin/vaadin-text-field/vaadin-text-field.js';
+import '@vaadin/text-field/vaadin-text-field.js';
 import '@vaadin/vaadin-template-renderer';
 import { createEventSpy, getFirstItem } from './helpers.js';
 import './not-animated-styles.js';

diff --git a/packages/vaadin-combo-box/test/lazy-loading.test.js b/packages/vaadin-combo-box/test/lazy-loading.test.js
@@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
 import sinon from 'sinon';
 import { fixtureSync, nextFrame, aTimeout, enterKeyDown, fire } from '@vaadin/testing-helpers';
 import { flush } from '@polymer/polymer/lib/utils/flush.js';
-import '@vaadin/vaadin-text-field/vaadin-text-field.js';
+import '@vaadin/text-field/vaadin-text-field.js';
 import { ComboBoxPlaceholder } from '../src/vaadin-combo-box-placeholder.js';
 import {
   flushComboBox,

diff --git a/packages/vaadin-custom-field/package.json b/packages/vaadin-custom-field/package.json
@@ -35,11 +35,15 @@
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/select": "^22.0.0-alpha6",
     "@vaadin/testing-helpers": "^0.3.0",
+    "@vaadin/email-field": "^22.0.0-alpha6",
+    "@vaadin/number-field": "^22.0.0-alpha6",
+    "@vaadin/password-field": "^22.0.0-alpha6",
+    "@vaadin/text-area": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-date-picker": "^22.0.0-alpha6",
     "@vaadin/vaadin-form-layout": "^22.0.0-alpha6",
     "@vaadin/vaadin-list-box": "^22.0.0-alpha6",
     "@vaadin/vaadin-template-renderer": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-time-picker": "^22.0.0-alpha6",
     "sinon": "^9.2.0"
   },

diff --git a/packages/vaadin-custom-field/test/visual/lumo/custom-field.test.js b/packages/vaadin-custom-field/test/visual/lumo/custom-field.test.js
@@ -8,11 +8,11 @@ import '@vaadin/vaadin-form-layout/theme/lumo/vaadin-form-item.js';
 import '@vaadin/vaadin-form-layout/theme/lumo/vaadin-form-layout.js';
 import '@vaadin/vaadin-list-box/theme/lumo/vaadin-list-box.js';
 import '@vaadin/select/theme/lumo/vaadin-select.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-email-field.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-number-field.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-area.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-password-field.js';
+import '@vaadin/email-field/theme/lumo/vaadin-email-field.js';
+import '@vaadin/number-field/theme/lumo/vaadin-number-field.js';
+import '@vaadin/password-field/theme/lumo/vaadin-password-field.js';
+import '@vaadin/text-area/theme/lumo/vaadin-text-area.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import '@vaadin/vaadin-time-picker/theme/lumo/vaadin-time-picker.js';
 import '../../../theme/lumo/vaadin-custom-field.js';
 

diff --git a/packages/vaadin-custom-field/test/visual/material/custom-field.test.js b/packages/vaadin-custom-field/test/visual/material/custom-field.test.js
@@ -8,11 +8,11 @@ import '@vaadin/vaadin-form-layout/theme/material/vaadin-form-item.js';
 import '@vaadin/vaadin-form-layout/theme/material/vaadin-form-layout.js';
 import '@vaadin/vaadin-list-box/theme/material/vaadin-list-box.js';
 import '@vaadin/select/theme/material/vaadin-select.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-email-field.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-number-field.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-area.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-password-field.js';
+import '@vaadin/email-field/theme/material/vaadin-email-field.js';
+import '@vaadin/number-field/theme/material/vaadin-number-field.js';
+import '@vaadin/password-field/theme/material/vaadin-password-field.js';
+import '@vaadin/text-area/theme/material/vaadin-text-area.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import '@vaadin/vaadin-time-picker/theme/material/vaadin-time-picker.js';
 import '../../../theme/material/vaadin-custom-field.js';
 

diff --git a/packages/vaadin-form-layout/package.json b/packages/vaadin-form-layout/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/testing-helpers": "^0.3.0",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "sinon": "^9.2.1"
   },
   "publishConfig": {

diff --git a/packages/vaadin-form-layout/test/form-layout.test.js b/packages/vaadin-form-layout/test/form-layout.test.js
@@ -3,7 +3,7 @@ import sinon from 'sinon';
 import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
 import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
 import '@polymer/polymer/lib/elements/dom-repeat.js';
-import '@vaadin/vaadin-text-field/vaadin-text-field.js';
+import '@vaadin/text-field/vaadin-text-field.js';
 import '../vaadin-form-layout.js';
 import '../vaadin-form-item.js';
 

diff --git a/packages/vaadin-grid-pro/package.json b/packages/vaadin-grid-pro/package.json
@@ -29,13 +29,13 @@
     "@vaadin/checkbox": "^22.0.0-alpha6",
     "@vaadin/component-base": "^22.0.0-alpha6",
     "@vaadin/select": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-grid": "^22.0.0-alpha6",
     "@vaadin/vaadin-item": "^22.0.0-alpha6",
     "@vaadin/vaadin-license-checker": "^2.1.0",
     "@vaadin/vaadin-list-box": "^22.0.0-alpha6",
     "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6"
   },
   "devDependencies": {

diff --git a/packages/vaadin-grid-pro/src/vaadin-grid-pro-edit-text-field.js b/packages/vaadin-grid-pro/src/vaadin-grid-pro-edit-text-field.js
@@ -4,15 +4,15 @@
  * This program is available under Commercial Vaadin Developer License 4.0 (CVDLv4).
  * See <a href="https://vaadin.com/license/cvdl-4.0">the website</a> for the complete license.
  */
-import { TextFieldElement } from '@vaadin/vaadin-text-field/src/vaadin-text-field.js';
+import { TextField } from '@vaadin/text-field/src/vaadin-text-field.js';
 
 /**
  * An element used internally by `<vaadin-grid-pro>`. Not intended to be used separately.
  *
- * @extends TextFieldElement
+ * @extends TextField
  * @private
  */
-class GridProEditTextFieldElement extends TextFieldElement {
+class GridProEditTextField extends TextField {
   static get is() {
     return 'vaadin-grid-pro-edit-text-field';
   }
@@ -23,4 +23,4 @@ class GridProEditTextFieldElement extends TextFieldElement {
   }
 }
 
-customElements.define(GridProEditTextFieldElement.is, GridProEditTextFieldElement);
+customElements.define(GridProEditTextField.is, GridProEditTextField);
diff --git a/packages/vaadin-grid-pro/test/edit-column-type.test.js b/packages/vaadin-grid-pro/test/edit-column-type.test.js
@@ -11,7 +11,7 @@ import {
   nextRender,
   space
 } from '@vaadin/testing-helpers';
-import { TextFieldElement } from '@vaadin/vaadin-text-field/src/vaadin-text-field.js';
+import { TextField } from '@vaadin/text-field/src/vaadin-text-field.js';
 import { Checkbox } from '@vaadin/checkbox/src/vaadin-checkbox.js';
 import { Select } from '@vaadin/select/src/vaadin-select.js';
 import '@vaadin/vaadin-template-renderer';
@@ -50,7 +50,7 @@ describe('edit column editor type', () => {
       cell = getContainerCell(grid.$.items, 0, 0);
       dblclick(cell._content);
       editor = column._getEditorComponent(cell);
-      expect(editor instanceof TextFieldElement).to.equal(true);
+      expect(editor instanceof TextField).to.equal(true);
     });
 
     it('should render the select to cell with select editor type specified', () => {

diff --git a/packages/vaadin-grid-pro/theme/lumo/vaadin-grid-pro-edit-text-field.js b/packages/vaadin-grid-pro/theme/lumo/vaadin-grid-pro-edit-text-field.js
@@ -1,3 +1,3 @@
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import './vaadin-grid-pro-edit-text-field-styles.js';
 import '../../src/vaadin-grid-pro-edit-text-field.js';
diff --git a/packages/vaadin-grid-pro/theme/lumo/vaadin-grid-pro-editor-styles.js b/packages/vaadin-grid-pro/theme/lumo/vaadin-grid-pro-editor-styles.js
@@ -30,7 +30,7 @@ const gridProEditor = css`
     box-shadow: none;
   }
 
-  :host([theme~='grid-pro-editor']) [part='value'] {
+  :host([theme~='grid-pro-editor']) ::slotted(input) {
     padding: 0 var(--lumo-space-m);
     font-size: inherit;
   }

diff --git a/packages/vaadin-grid-pro/theme/material/vaadin-grid-pro-edit-text-field.js b/packages/vaadin-grid-pro/theme/material/vaadin-grid-pro-edit-text-field.js
@@ -1,3 +1,3 @@
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import './vaadin-grid-pro-edit-text-field-styles.js';
 import '../../src/vaadin-grid-pro-edit-text-field.js';
diff --git a/packages/vaadin-grid-pro/theme/material/vaadin-grid-pro-editor-styles.js b/packages/vaadin-grid-pro/theme/material/vaadin-grid-pro-editor-styles.js
@@ -10,7 +10,7 @@ const gridProEditor = css`
     font-size: inherit;
   }
 
-  :host([theme~='grid-pro-editor']) [part='value'] {
+  :host([theme~='grid-pro-editor']) ::slotted(input) {
     box-sizing: border-box;
     font-size: inherit;
   }

diff --git a/packages/vaadin-grid/package.json b/packages/vaadin-grid/package.json
@@ -33,10 +33,10 @@
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
     "@vaadin/checkbox": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "@vaadin/component-base": "^22.0.0-alpha6",
     "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6",
     "@vaadin/vaadin-virtual-list": "^22.0.0-alpha6"
   },

diff --git a/packages/vaadin-grid/src/vaadin-grid-filter.js b/packages/vaadin-grid/src/vaadin-grid-filter.js
@@ -6,7 +6,7 @@
 import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
 import { timeOut } from '@vaadin/component-base/src/async.js';
-import '@vaadin/vaadin-text-field/src/vaadin-text-field.js';
+import '@vaadin/text-field/src/vaadin-text-field.js';
 
 /**
  * `<vaadin-grid-filter>` is a helper element for the `<vaadin-grid>` that provides out-of-the-box UI controls,

diff --git a/packages/vaadin-grid/test/templates.test.js b/packages/vaadin-grid/test/templates.test.js
@@ -4,7 +4,7 @@ import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
 import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
 import '@polymer/polymer/lib/elements/dom-bind.js';
 import '@vaadin/vaadin-template-renderer';
-import '@vaadin/vaadin-text-field/vaadin-text-field.js';
+import '@vaadin/text-field/vaadin-text-field.js';
 import {
   flushGrid,
   getBodyCellContent,

diff --git a/packages/vaadin-grid/theme/lumo/vaadin-grid-filter.js b/packages/vaadin-grid/theme/lumo/vaadin-grid-filter.js
@@ -1,2 +1,2 @@
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import '../../src/vaadin-grid-filter.js';
diff --git a/packages/vaadin-grid/theme/material/vaadin-grid-filter.js b/packages/vaadin-grid/theme/material/vaadin-grid-filter.js
@@ -1,2 +1,2 @@
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import '../../src/vaadin-grid-filter.js';
diff --git a/packages/vaadin-login/package.json b/packages/vaadin-login/package.json
@@ -29,10 +29,10 @@
     "@vaadin/button": "^22.0.0-alpha6",
     "@vaadin/component-base": "^22.0.0-alpha6",
     "@vaadin/password-field": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-lumo-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-material-styles": "^22.0.0-alpha6",
     "@vaadin/vaadin-overlay": "^22.0.0-alpha6",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
     "@vaadin/vaadin-themable-mixin": "^22.0.0-alpha6"
   },
   "devDependencies": {

diff --git a/packages/vaadin-login/src/vaadin-login-form.js b/packages/vaadin-login/src/vaadin-login-form.js
@@ -7,7 +7,7 @@
 import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import '@vaadin/vaadin-text-field/src/vaadin-text-field.js';
+import '@vaadin/text-field/src/vaadin-text-field.js';
 import '@vaadin/password-field/src/vaadin-password-field.js';
 import './vaadin-login-form-wrapper.js';
 import { LoginMixin } from './vaadin-login-mixin.js';

diff --git a/packages/vaadin-login/theme/lumo/vaadin-login-form.js b/packages/vaadin-login/theme/lumo/vaadin-login-form.js
@@ -1,4 +1,4 @@
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
 import '@vaadin/password-field/theme/lumo/vaadin-password-field.js';
 import './vaadin-login-form-wrapper.js';
 import './vaadin-login-form-styles.js';

diff --git a/packages/vaadin-login/theme/lumo/vaadin-login-overlay.js b/packages/vaadin-login/theme/lumo/vaadin-login-overlay.js
@@ -1,5 +1,5 @@
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-text-field.js';
-import '@vaadin/vaadin-text-field/theme/lumo/vaadin-password-field.js';
+import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
+import '@vaadin/password-field/theme/lumo/vaadin-password-field.js';
 import '@vaadin/button/theme/lumo/vaadin-button.js';
 import '@vaadin/vaadin-overlay/theme/lumo/vaadin-overlay.js';
 import './vaadin-login-form.js';

diff --git a/packages/vaadin-login/theme/material/vaadin-login-form.js b/packages/vaadin-login/theme/material/vaadin-login-form.js
@@ -1,4 +1,4 @@
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
 import '@vaadin/password-field/theme/material/vaadin-password-field.js';
 import './vaadin-login-form-wrapper.js';
 import './vaadin-login-form-styles.js';

diff --git a/packages/vaadin-login/theme/material/vaadin-login-overlay.js b/packages/vaadin-login/theme/material/vaadin-login-overlay.js
@@ -1,5 +1,5 @@
-import '@vaadin/vaadin-text-field/theme/material/vaadin-text-field.js';
-import '@vaadin/vaadin-text-field/theme/material/vaadin-password-field.js';
+import '@vaadin/text-field/theme/material/vaadin-text-field.js';
+import '@vaadin/password-field/theme/material/vaadin-password-field.js';
 import '@vaadin/button/theme/material/vaadin-button.js';
 import '@vaadin/vaadin-overlay/theme/material/vaadin-overlay.js';
 import './vaadin-login-form.js';

diff --git a/packages/vaadin-overlay/package.json b/packages/vaadin-overlay/package.json
@@ -38,7 +38,7 @@
     "@vaadin/button": "^22.0.0-alpha6",
     "@vaadin/radio-group": "^22.0.0-alpha6",
     "@vaadin/testing-helpers": "^0.3.0",
-    "@vaadin/vaadin-text-field": "^22.0.0-alpha6",
+    "@vaadin/text-field": "^22.0.0-alpha6",
     "lit": "^2.0.0",
     "sinon": "^9.2.1"
   },