javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into chore-update-from-main-2

Browse Source
This commit is contained in:
Brandy Carney
2024-09-06 10:25:27 -04:00
parent 9a8c49ae7f ac3959a8c1
commit 93b734c840
765 changed files with 11338 additions and 1754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/components/select/select.tsx
View File

@ -129,7 +129,7 @@ export class Select implements ComponentInterface {
* `"space-between"`: The label and select will appear on opposite
* ends of the line with space between the two elements.
*/
@Prop() justify: 'start' | 'end' | 'space-between' = 'space-between';
@Prop() justify?: 'start' | 'end' | 'space-between';
/**
* The visible label associated with the select.
@ -997,7 +997,7 @@ export class Select implements ComponentInterface {
this;
const theme = getIonTheme(this);
const hasFloatingOrStackedLabel = labelPlacement === 'floating' || labelPlacement === 'stacked';
const justifyEnabled = !hasFloatingOrStackedLabel;
const justifyEnabled = !hasFloatingOrStackedLabel && justify !== undefined;
const rtl = isRTL(el) ? 'rtl' : 'ltr';
const inItem = hostContext('ion-item', this.el);
const shouldRenderHighlight = theme === 'md' && fill !== 'outline' && !inItem;