Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion core/src/components/input/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,26 @@ export class Input implements ComponentInterface {
}
}

/**
* dir is a globally enumerated attribute.
* As a result, creating these as properties
* can have unintended side effects. Instead, we
* listen for attribute changes and inherit them
* to the inner `<input>` element.
*/
@Watch('dir')
onDirChanged(newValue: string) {
this.inheritedAttributes = {
...this.inheritedAttributes,
dir: newValue,
};
forceUpdate(this);
}

componentWillLoad() {
this.inheritedAttributes = {
...inheritAriaAttributes(this.el),
...inheritAttributes(this.el, ['tabindex', 'title', 'data-form-type']),
...inheritAttributes(this.el, ['tabindex', 'title', 'data-form-type', 'dir']),
};
}

Expand Down
18 changes: 18 additions & 0 deletions core/src/components/input/test/input.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,24 @@ describe('input: rendering', () => {
const bottomContent = page.body.querySelector('ion-input .input-bottom');
expect(bottomContent).toBe(null);
});

it('should inherit watched attributes', async () => {
const page = await newSpecPage({
components: [Input],
html: '<ion-input label="Input" dir="ltr"></ion-input>',
});

const inputEl = page.body.querySelector('ion-input')!;
const nativeEl = inputEl.querySelector('input')!;

expect(nativeEl.getAttribute('dir')).toBe('ltr');

inputEl.setAttribute('dir', 'rtl');

await page.waitForChanges();

expect(nativeEl.getAttribute('dir')).toBe('rtl');
});
});

/**
Expand Down
18 changes: 18 additions & 0 deletions core/src/components/textarea/test/textarea.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,24 @@ it('should inherit attributes', async () => {
expect(nativeEl.getAttribute('data-form-type')).toBe('password');
});

it('should inherit watched attributes', async () => {
const page = await newSpecPage({
components: [Textarea],
html: '<ion-textarea dir="ltr"></ion-textarea>',
});

const textareaEl = page.body.querySelector('ion-textarea')!;
const nativeEl = textareaEl.querySelector('textarea')!;

expect(nativeEl.getAttribute('dir')).toBe('ltr');

textareaEl.setAttribute('dir', 'rtl');

await page.waitForChanges();

expect(nativeEl.getAttribute('dir')).toBe('rtl');
});

/**
* Textarea uses emulated slots, so the internal
* behavior will not exactly match IonSelect's slots.
Expand Down
18 changes: 17 additions & 1 deletion core/src/components/textarea/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,22 @@ export class Textarea implements ComponentInterface {
this.runAutoGrow();
}

/**
* dir is a globally enumerated attribute.
* As a result, creating these as properties
* can have unintended side effects. Instead, we
* listen for attribute changes and inherit them
* to the inner `<textarea>` element.
*/
@Watch('dir')
onDirChanged(newValue: string) {
this.inheritedAttributes = {
...this.inheritedAttributes,
dir: newValue,
};
forceUpdate(this);
}

/**
* The `ionChange` event is fired when the user modifies the textarea's value.
* Unlike the `ionInput` event, the `ionChange` event is fired when
Expand Down Expand Up @@ -331,7 +347,7 @@ export class Textarea implements ComponentInterface {
componentWillLoad() {
this.inheritedAttributes = {
...inheritAriaAttributes(this.el),
...inheritAttributes(this.el, ['data-form-type', 'title', 'tabindex']),
...inheritAttributes(this.el, ['data-form-type', 'title', 'tabindex', 'dir']),
};
}

Expand Down
Loading