Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(input-date-picker): respect the numberingSystem property when rendering the input #8383

Merged
merged 3 commits into from
Dec 9, 2023
Merged

fix(input-date-picker): respect the numberingSystem property when rendering the input #8383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
408737a
fix(input-date-picker): respect the numberingSystem property when ren…
benelan Dec 8, 2023
da96eb2
test: update dark mode story with ar/arab
benelan Dec 8, 2023
abce745
Merge branch 'main' into benelan/7383-input-date-incorrect-numbering-…
benelan Dec 8, 2023
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
6 changes: 4 additions & 2 deletions packages/calcite-components/src/components/input-date-picker/input-date-picker.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,18 @@ export const scales_TestOnly = (): string =>
</div>
`;

export const darkModeRTL_TestOnly = (): string => html`
export const arabicLocaleDarkModeRTL_TestOnly = (): string => html`
<div style="width: 400px">
<calcite-input-date-picker
class="calcite-mode-dark"
dir="rtl"
value="2020-12-12"
numbering-system="arab"
lang="ar"
></calcite-input-date-picker
</div>
`;
darkModeRTL_TestOnly.parameters = { modes: modesDarkDefault };
arabicLocaleDarkModeRTL_TestOnly.parameters = { modes: modesDarkDefault };

export const widthSetToBreakpoints_TestOnly = (): string =>
createBreakpointStories(
Expand Down
13 changes: 5 additions & 8 deletions packages/calcite-components/src/components/input-date-picker/input-date-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import {
} from "../../utils/loadable";
import {
connectLocalized,
defaultNumberingSystem,
getSupportedNumberingSystem,
disconnectLocalized,
LocalizedComponent,
NumberingSystem,
Expand Down Expand Up @@ -133,8 +133,7 @@ export class InputDatePicker
*
* When not set, the component will be associated with its ancestor form element, if any.
*/
@Prop({ reflect: true })
form: string;
@Prop({ reflect: true }) form: string;

/**
* When `true`, the component's value can be read, but controls are not accessible and the value cannot be modified.
Expand Down Expand Up @@ -1009,14 +1008,12 @@ export class InputDatePicker
const formattingOptions = {
// we explicitly set numberingSystem to prevent the browser-inferred value
// see https://github.com/Esri/calcite-design-system/issues/3079#issuecomment-1168964195 for more info
numberingSystem: defaultNumberingSystem,
numberingSystem: getSupportedNumberingSystem(this.numberingSystem),
};

const localizedDate =
date && this.formatNumerals(date.toLocaleDateString(this.effectiveLocale, formattingOptions));
const localizedDate = date && date.toLocaleDateString(this.effectiveLocale, formattingOptions);
const localizedEndDate =
endDate &&
this.formatNumerals(endDate.toLocaleDateString(this.effectiveLocale, formattingOptions));
endDate && endDate.toLocaleDateString(this.effectiveLocale, formattingOptions);

this.setInputValue(localizedDate ?? "", "start");
this.setInputValue((this.range && localizedEndDate) ?? "", "end");
Expand Down