Skip to content

Commit 4af4ce3

Browse files
authored
fix: inject placeholder styles to correct root node (#4577)
1 parent de6dc93 commit 4af4ce3

9 files changed

Lines changed: 29 additions & 30 deletions

File tree

‎packages/field-base/src/input-control-mixin.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import type { FieldMixinClass } from './field-mixin.js';
1414
import type { InputConstraintsMixinClass } from './input-constraints-mixin.js';
1515
import type { InputMixinClass } from './input-mixin.js';
1616
import type { LabelMixinClass } from './label-mixin.js';
17+
import type { SlotStylesMixinClass } from './slot-styles-mixin.js';
1718
import type { ValidateMixinClass } from './validate-mixin.js';
1819

1920
/**
@@ -32,6 +33,7 @@ export declare function InputControlMixin<T extends Constructor<HTMLElement>>(
3233
Constructor<InputMixinClass> &
3334
Constructor<KeyboardMixinClass> &
3435
Constructor<LabelMixinClass> &
36+
Constructor<SlotStylesMixinClass> &
3537
Constructor<ValidateMixinClass> &
3638
T;
3739

‎packages/field-base/src/input-control-mixin.js‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js';
99
import { DelegateFocusMixin } from './delegate-focus-mixin.js';
1010
import { FieldMixin } from './field-mixin.js';
1111
import { InputConstraintsMixin } from './input-constraints-mixin.js';
12+
import { SlotStylesMixin } from './slot-styles-mixin.js';
1213

1314
/**
1415
* A mixin to provide shared logic for the editable form input controls.
@@ -18,10 +19,11 @@ import { InputConstraintsMixin } from './input-constraints-mixin.js';
1819
* @mixes FieldMixin
1920
* @mixes InputConstraintsMixin
2021
* @mixes KeyboardMixin
22+
* @mixes SlotStylesMixin
2123
*/
2224
export const InputControlMixin = (superclass) =>
23-
class InputControlMixinClass extends DelegateFocusMixin(
24-
InputConstraintsMixin(FieldMixin(KeyboardMixin(superclass))),
25+
class InputControlMixinClass extends SlotStylesMixin(
26+
DelegateFocusMixin(InputConstraintsMixin(FieldMixin(KeyboardMixin(superclass)))),
2527
) {
2628
static get properties() {
2729
return {
@@ -118,6 +120,19 @@ export const InputControlMixin = (superclass) =>
118120
return null;
119121
}
120122

123+
/** @protected */
124+
get slotStyles() {
125+
// Needed for Safari, where ::slotted(...)::placeholder does not work
126+
return [
127+
`
128+
:is(input[slot='input'], textarea[slot='textarea'])::placeholder {
129+
font: inherit;
130+
color: inherit;
131+
}
132+
`,
133+
];
134+
}
135+
121136
/** @protected */
122137
ready() {
123138
super.ready();

‎packages/field-base/src/input-field-mixin.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type { InputConstraintsMixinClass } from './input-constraints-mixin.js';
1515
import type { InputControlMixinClass } from './input-control-mixin.js';
1616
import type { InputMixinClass } from './input-mixin.js';
1717
import type { LabelMixinClass } from './label-mixin.js';
18+
import type { SlotStylesMixinClass } from './slot-styles-mixin.js';
1819
import type { ValidateMixinClass } from './validate-mixin.js';
1920

2021
/**
@@ -34,6 +35,7 @@ export declare function InputFieldMixin<T extends Constructor<HTMLElement>>(
3435
Constructor<InputMixinClass> &
3536
Constructor<KeyboardMixinClass> &
3637
Constructor<LabelMixinClass> &
38+
Constructor<SlotStylesMixinClass> &
3739
Constructor<ValidateMixinClass> &
3840
T;
3941

‎packages/input-container/src/vaadin-input-container.js‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
import { html, PolymerElement } from '@polymer/polymer';
77
import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
8-
import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
98
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
109

1110
export class InputContainer extends ThemableMixin(DirMixin(PolymerElement)) {
@@ -56,7 +55,6 @@ export class InputContainer extends ThemableMixin(DirMixin(PolymerElement)) {
5655
::slotted(:is(input, textarea))::placeholder {
5756
/* Use ::slotted(input:placeholder-shown) in themes to style the placeholder. */
5857
/* because ::slotted(...)::placeholder does not work in Safari. */
59-
/* See the workaround at the end of this file. */
6058
font: inherit;
6159
color: inherit;
6260
/* Override default opacity in Firefox */
@@ -122,15 +120,3 @@ export class InputContainer extends ThemableMixin(DirMixin(PolymerElement)) {
122120
}
123121

124122
customElements.define(InputContainer.is, InputContainer);
125-
126-
const placeholderStyleWorkaround = css`
127-
/* Needed for Safari, where ::slotted(...)::placeholder does not work */
128-
:is(input[slot='input'], textarea[slot='textarea'])::placeholder {
129-
font: inherit;
130-
color: inherit;
131-
}
132-
`;
133-
134-
const $tpl = document.createElement('template');
135-
$tpl.innerHTML = `<style>${placeholderStyleWorkaround.toString()}</style>`;
136-
document.head.appendChild($tpl.content);

‎packages/multi-select-combo-box/src/vaadin-multi-select-combo-box.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { TooltipController } from '@vaadin/component-base/src/tooltip-controller
1515
import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js';
1616
import { InputController } from '@vaadin/field-base/src/input-controller.js';
1717
import { LabelledInputController } from '@vaadin/field-base/src/labelled-input-controller.js';
18-
import { SlotStylesMixin } from '@vaadin/field-base/src/slot-styles-mixin.js';
1918
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
2019
import { css, registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
2120

@@ -137,11 +136,8 @@ registerStyles('vaadin-multi-select-combo-box', [inputFieldShared, multiSelectCo
137136
* @mixes ThemableMixin
138137
* @mixes InputControlMixin
139138
* @mixes ResizeMixin
140-
* @mixes SlotStylesMixin
141139
*/
142-
class MultiSelectComboBox extends SlotStylesMixin(
143-
ResizeMixin(InputControlMixin(ThemableMixin(ElementMixin(PolymerElement)))),
144-
) {
140+
class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(ElementMixin(PolymerElement)))) {
145141
static get is() {
146142
return 'vaadin-multi-select-combo-box';
147143
}
@@ -480,6 +476,7 @@ class MultiSelectComboBox extends SlotStylesMixin(
480476
get slotStyles() {
481477
const tag = this.localName;
482478
return [
479+
...super.slotStyles,
483480
`
484481
${tag}[has-value] input::placeholder {
485482
color: transparent !important;

‎packages/number-field/src/vaadin-number-field.d.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
77
import { InputFieldMixin } from '@vaadin/field-base/src/input-field-mixin.js';
8-
import { SlotStylesMixin } from '@vaadin/field-base/src/slot-styles-mixin.js';
98
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
109

1110
/**
@@ -69,7 +68,7 @@ export interface NumberFieldEventMap extends HTMLElementEventMap, NumberFieldCus
6968
* @fires {CustomEvent} value-changed - Fired when the `value` property changes.
7069
* @fires {CustomEvent} validated - Fired whenever the field is validated.
7170
*/
72-
declare class NumberField extends InputFieldMixin(SlotStylesMixin(ThemableMixin(ElementMixin(HTMLElement)))) {
71+
declare class NumberField extends InputFieldMixin(ThemableMixin(ElementMixin(HTMLElement))) {
7372
/**
7473
* Set to true to display value increase/decrease controls.
7574
* @attr {boolean} has-controls

‎packages/number-field/src/vaadin-number-field.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { TooltipController } from '@vaadin/component-base/src/tooltip-controller
1010
import { InputController } from '@vaadin/field-base/src/input-controller.js';
1111
import { InputFieldMixin } from '@vaadin/field-base/src/input-field-mixin.js';
1212
import { LabelledInputController } from '@vaadin/field-base/src/labelled-input-controller.js';
13-
import { SlotStylesMixin } from '@vaadin/field-base/src/slot-styles-mixin.js';
1413
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
1514
import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1615

@@ -51,7 +50,7 @@ registerStyles('vaadin-number-field', inputFieldShared, { moduleId: 'vaadin-numb
5150
* @mixes ElementMixin
5251
* @mixes ThemableMixin
5352
*/
54-
export class NumberField extends InputFieldMixin(SlotStylesMixin(ThemableMixin(ElementMixin(PolymerElement)))) {
53+
export class NumberField extends InputFieldMixin(ThemableMixin(ElementMixin(PolymerElement))) {
5554
static get is() {
5655
return 'vaadin-number-field';
5756
}
@@ -190,6 +189,7 @@ export class NumberField extends InputFieldMixin(SlotStylesMixin(ThemableMixin(E
190189
get slotStyles() {
191190
const tag = this.localName;
192191
return [
192+
...super.slotStyles,
193193
`
194194
${tag} input[type="number"]::-webkit-outer-spin-button,
195195
${tag} input[type="number"]::-webkit-inner-spin-button {

‎packages/password-field/src/vaadin-password-field.d.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright (c) 2021 - 2022 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6-
import { SlotStylesMixin } from '@vaadin/field-base/src/slot-styles-mixin.js';
76
import { TextField } from '@vaadin/text-field/src/vaadin-text-field.js';
87

98
/**
@@ -72,7 +71,7 @@ export interface PasswordFieldEventMap extends HTMLElementEventMap, PasswordFiel
7271
* @fires {CustomEvent} value-changed - Fired when the `value` property changes.
7372
* @fires {CustomEvent} validated - Fired whenever the field is validated.
7473
*/
75-
declare class PasswordField extends SlotStylesMixin(TextField) {
74+
declare class PasswordField extends TextField {
7675
/**
7776
* Set to true to hide the eye icon which toggles the password visibility.
7877
* @attr {boolean} reveal-button-hidden

‎packages/password-field/src/vaadin-password-field.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import './vaadin-password-field-button.js';
77
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
88
import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
9-
import { SlotStylesMixin } from '@vaadin/field-base/src/slot-styles-mixin.js';
109
import { TextField } from '@vaadin/text-field/src/vaadin-text-field.js';
1110

1211
const ownTemplate = html`
@@ -50,9 +49,8 @@ let memoizedTemplate;
5049
* @fires {CustomEvent} validated - Fired whenever the field is validated.
5150
*
5251
* @extends TextField
53-
* @mixes SlotStylesMixin
5452
*/
55-
export class PasswordField extends SlotStylesMixin(TextField) {
53+
export class PasswordField extends TextField {
5654
static get is() {
5755
return 'vaadin-password-field';
5856
}
@@ -127,6 +125,7 @@ export class PasswordField extends SlotStylesMixin(TextField) {
127125
get slotStyles() {
128126
const tag = this.localName;
129127
return [
128+
...super.slotStyles,
130129
`
131130
${tag} [slot="input"]::-ms-reveal {
132131
display: none;

0 commit comments

Comments
 (0)