Skip to content

Commit 5961b86

Browse files
Merge branch 'feature-8.5' into ROU-11118_V2
2 parents df33f7b + 18e26ac commit 5961b86

File tree

278 files changed

+2472
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+2472
-129
lines changed

.github/workflows/assign-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
- name: 'Auto-assign issue'
1414
uses: pozil/auto-assign-issue@39c06395cbac76e79afc4ad4e5c5c6db6ecfdd2e # v2.2.0
1515
with:
16-
assignees: brandyscarney, thetaPC, joselrio, rugoncalves, BenOsodrac, JoaoFerreira-FrontEnd, OS-giulianasilva, tanner-reits
16+
assignees: brandyscarney, thetaPC, ShaneK
1717
numOfAssignee: 1
1818
allowSelfAssign: false

core/api.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,8 @@ ion-checkbox,prop,alignment,"center" | "start" | undefined,undefined,false,false
398398
ion-checkbox,prop,checked,boolean,false,false,false
399399
ion-checkbox,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true
400400
ion-checkbox,prop,disabled,boolean,false,false,false
401+
ion-checkbox,prop,errorText,string | undefined,undefined,false,false
402+
ion-checkbox,prop,helperText,string | undefined,undefined,false,false
401403
ion-checkbox,prop,indeterminate,boolean,false,false,false
402404
ion-checkbox,prop,justify,"end" | "space-between" | "start" | undefined,undefined,false,false
403405
ion-checkbox,prop,labelPlacement,"end" | "fixed" | "stacked" | "start",'start',false,false
@@ -431,8 +433,11 @@ ion-checkbox,css-prop,--size,md
431433
ion-checkbox,css-prop,--transition,ios
432434
ion-checkbox,css-prop,--transition,md
433435
ion-checkbox,part,container
436+
ion-checkbox,part,error-text
437+
ion-checkbox,part,helper-text
434438
ion-checkbox,part,label
435439
ion-checkbox,part,mark
440+
ion-checkbox,part,supporting-text
436441

437442
ion-chip,shadow
438443
ion-chip,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true
@@ -1348,6 +1353,8 @@ ion-radio,part,mark
13481353
ion-radio-group,none
13491354
ion-radio-group,prop,allowEmptySelection,boolean,false,false,false
13501355
ion-radio-group,prop,compareWith,((currentValue: any, compareValue: any) => boolean) | null | string | undefined,undefined,false,false
1356+
ion-radio-group,prop,errorText,string | undefined,undefined,false,false
1357+
ion-radio-group,prop,helperText,string | undefined,undefined,false,false
13511358
ion-radio-group,prop,name,string,this.inputId,false,false
13521359
ion-radio-group,prop,value,any,undefined,false,false
13531360
ion-radio-group,event,ionChange,RadioGroupChangeEventDetail<any>,true
@@ -1622,8 +1629,10 @@ ion-select,prop,cancelText,string,'Cancel',false,false
16221629
ion-select,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true
16231630
ion-select,prop,compareWith,((currentValue: any, compareValue: any) => boolean) | null | string | undefined,undefined,false,false
16241631
ion-select,prop,disabled,boolean,false,false,false
1632+
ion-select,prop,errorText,string | undefined,undefined,false,false
16251633
ion-select,prop,expandedIcon,string | undefined,undefined,false,false
16261634
ion-select,prop,fill,"outline" | "solid" | undefined,undefined,false,false
1635+
ion-select,prop,helperText,string | undefined,undefined,false,false
16271636
ion-select,prop,interface,"action-sheet" | "alert" | "modal" | "popover",'alert',false,false
16281637
ion-select,prop,interfaceOptions,any,{},false,false
16291638
ion-select,prop,justify,"end" | "space-between" | "start" | undefined,undefined,false,false
@@ -1678,9 +1687,12 @@ ion-select,css-prop,--placeholder-opacity,md
16781687
ion-select,css-prop,--ripple-color,ios
16791688
ion-select,css-prop,--ripple-color,md
16801689
ion-select,part,container
1690+
ion-select,part,error-text
1691+
ion-select,part,helper-text
16811692
ion-select,part,icon
16821693
ion-select,part,label
16831694
ion-select,part,placeholder
1695+
ion-select,part,supporting-text
16841696
ion-select,part,text
16851697

16861698
ion-select-modal,scoped
@@ -1944,6 +1956,8 @@ ion-toggle,prop,checked,boolean,false,false,false
19441956
ion-toggle,prop,color,"danger" | "dark" | "light" | "medium" | "primary" | "secondary" | "success" | "tertiary" | "warning" | string & Record<never, never> | undefined,undefined,false,true
19451957
ion-toggle,prop,disabled,boolean,false,false,false
19461958
ion-toggle,prop,enableOnOffLabels,boolean | undefined,config.get('toggleOnOffLabels'),false,false
1959+
ion-toggle,prop,errorText,string | undefined,undefined,false,false
1960+
ion-toggle,prop,helperText,string | undefined,undefined,false,false
19471961
ion-toggle,prop,justify,"end" | "space-between" | "start" | undefined,undefined,false,false
19481962
ion-toggle,prop,labelPlacement,"end" | "fixed" | "stacked" | "start",'start',false,false
19491963
ion-toggle,prop,mode,"ios" | "md",undefined,false,false
@@ -1977,8 +1991,11 @@ ion-toggle,css-prop,--track-background,ios
19771991
ion-toggle,css-prop,--track-background,md
19781992
ion-toggle,css-prop,--track-background-checked,ios
19791993
ion-toggle,css-prop,--track-background-checked,md
1994+
ion-toggle,part,error-text
19801995
ion-toggle,part,handle
1996+
ion-toggle,part,helper-text
19811997
ion-toggle,part,label
1998+
ion-toggle,part,supporting-text
19821999
ion-toggle,part,track
19832000

19842001
ion-toolbar,shadow

core/package-lock.json

Lines changed: 35 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
},
3838
"devDependencies": {
3939
"@axe-core/playwright": "^4.10.0",
40-
"@capacitor/core": "^6.0.0",
41-
"@capacitor/haptics": "^6.0.0",
42-
"@capacitor/keyboard": "^6.0.0",
43-
"@capacitor/status-bar": "^6.0.0",
40+
"@capacitor/core": "^7.0.0",
41+
"@capacitor/haptics": "^7.0.0",
42+
"@capacitor/keyboard": "^7.0.0",
43+
"@capacitor/status-bar": "^7.0.0",
4444
"@clack/prompts": "^0.10.0",
4545
"@ionic/eslint-config": "^0.3.0",
4646
"@ionic/prettier-config": "^2.0.0",

core/src/components.d.ts

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,14 @@ export namespace Components {
623623
* If `true`, the user cannot interact with the checkbox.
624624
*/
625625
"disabled": boolean;
626+
/**
627+
* Text that is placed under the checkbox label and displayed when an error is detected.
628+
*/
629+
"errorText"?: string;
630+
/**
631+
* Text that is placed under the checkbox label and displayed when no error is detected.
632+
*/
633+
"helperText"?: string;
626634
/**
627635
* If `true`, the checkbox will visually appear as indeterminate.
628636
*/
@@ -1740,7 +1748,7 @@ export namespace Components {
17401748
*/
17411749
"enterAnimation"?: AnimationBuilder;
17421750
/**
1743-
* Controls whether scrolling or dragging within the sheet modal expands it to a larger breakpoint. This only takes effect when `breakpoints` and `initialBreakpoint` are set. If `true`, scrolling or dragging anywhere in the modal will first expand it to the next breakpoint. Once fully expanded, scrolling will affect the content. If `false`, scrolling will always affect the content, and the modal will only expand when dragging the header or handle.
1751+
* Controls whether scrolling or dragging within the sheet modal expands it to a larger breakpoint. This only takes effect when `breakpoints` and `initialBreakpoint` are set. If `true`, scrolling or dragging anywhere in the modal will first expand it to the next breakpoint. Once fully expanded, scrolling will affect the content. If `false`, scrolling will always affect the content. The modal will only expand when dragging the header or handle. The modal will close when dragging the header or handle. It can also be closed when dragging the content, but only if the content is scrolled to the top.
17441752
*/
17451753
"expandToScroll": boolean;
17461754
/**
@@ -2311,6 +2319,14 @@ export namespace Components {
23112319
* This property allows developers to specify a custom function or property name for comparing objects when determining the selected option in the ion-radio-group. When not specified, the default behavior will use strict equality (===) for comparison.
23122320
*/
23132321
"compareWith"?: string | RadioGroupCompareFn | null;
2322+
/**
2323+
* The error text to display at the top of the radio group.
2324+
*/
2325+
"errorText"?: string;
2326+
/**
2327+
* The helper text to display at the top of the radio group.
2328+
*/
2329+
"helperText"?: string;
23142330
/**
23152331
* The name of the control, which is submitted with the form data.
23162332
*/
@@ -2767,6 +2783,10 @@ export namespace Components {
27672783
* If `true`, the user cannot interact with the select.
27682784
*/
27692785
"disabled": boolean;
2786+
/**
2787+
* Text that is placed under the select and displayed when an error is detected.
2788+
*/
2789+
"errorText"?: string;
27702790
/**
27712791
* The toggle icon to show when the select is open. If defined, the icon rotation behavior in `md` mode will be disabled. If undefined, `toggleIcon` will be used for when the select is both open and closed.
27722792
*/
@@ -2775,6 +2795,10 @@ export namespace Components {
27752795
* The fill for the item. If `"solid"` the item will have a background. If `"outline"` the item will be transparent with a border. Only available in `md` mode.
27762796
*/
27772797
"fill"?: 'outline' | 'solid';
2798+
/**
2799+
* Text that is placed under the select and displayed when no error is detected.
2800+
*/
2801+
"helperText"?: string;
27782802
/**
27792803
* The interface the select should use: `action-sheet`, `popover`, `alert`, or `modal`.
27802804
*/
@@ -3280,6 +3304,14 @@ export namespace Components {
32803304
* Enables the on/off accessibility switch labels within the toggle.
32813305
*/
32823306
"enableOnOffLabels": boolean | undefined;
3307+
/**
3308+
* Text that is placed under the toggle label and displayed when an error is detected.
3309+
*/
3310+
"errorText"?: string;
3311+
/**
3312+
* Text that is placed under the toggle label and displayed when no error is detected.
3313+
*/
3314+
"helperText"?: string;
32833315
/**
32843316
* How to pack the label and toggle within a line. `"start"`: The label and toggle will appear on the left in LTR and on the right in RTL. `"end"`: The label and toggle will appear on the right in LTR and on the left in RTL. `"space-between"`: The label and toggle will appear on opposite ends of the line with space between the two elements. Setting this property will change the toggle `display` to `block`.
32853317
*/
@@ -5423,6 +5455,14 @@ declare namespace LocalJSX {
54235455
* If `true`, the user cannot interact with the checkbox.
54245456
*/
54255457
"disabled"?: boolean;
5458+
/**
5459+
* Text that is placed under the checkbox label and displayed when an error is detected.
5460+
*/
5461+
"errorText"?: string;
5462+
/**
5463+
* Text that is placed under the checkbox label and displayed when no error is detected.
5464+
*/
5465+
"helperText"?: string;
54265466
/**
54275467
* If `true`, the checkbox will visually appear as indeterminate.
54285468
*/
@@ -6561,7 +6601,7 @@ declare namespace LocalJSX {
65616601
*/
65626602
"enterAnimation"?: AnimationBuilder;
65636603
/**
6564-
* Controls whether scrolling or dragging within the sheet modal expands it to a larger breakpoint. This only takes effect when `breakpoints` and `initialBreakpoint` are set. If `true`, scrolling or dragging anywhere in the modal will first expand it to the next breakpoint. Once fully expanded, scrolling will affect the content. If `false`, scrolling will always affect the content, and the modal will only expand when dragging the header or handle.
6604+
* Controls whether scrolling or dragging within the sheet modal expands it to a larger breakpoint. This only takes effect when `breakpoints` and `initialBreakpoint` are set. If `true`, scrolling or dragging anywhere in the modal will first expand it to the next breakpoint. Once fully expanded, scrolling will affect the content. If `false`, scrolling will always affect the content. The modal will only expand when dragging the header or handle. The modal will close when dragging the header or handle. It can also be closed when dragging the content, but only if the content is scrolled to the top.
65656605
*/
65666606
"expandToScroll"?: boolean;
65676607
/**
@@ -7087,6 +7127,14 @@ declare namespace LocalJSX {
70877127
* This property allows developers to specify a custom function or property name for comparing objects when determining the selected option in the ion-radio-group. When not specified, the default behavior will use strict equality (===) for comparison.
70887128
*/
70897129
"compareWith"?: string | RadioGroupCompareFn | null;
7130+
/**
7131+
* The error text to display at the top of the radio group.
7132+
*/
7133+
"errorText"?: string;
7134+
/**
7135+
* The helper text to display at the top of the radio group.
7136+
*/
7137+
"helperText"?: string;
70907138
/**
70917139
* The name of the control, which is submitted with the form data.
70927140
*/
@@ -7600,6 +7648,10 @@ declare namespace LocalJSX {
76007648
* If `true`, the user cannot interact with the select.
76017649
*/
76027650
"disabled"?: boolean;
7651+
/**
7652+
* Text that is placed under the select and displayed when an error is detected.
7653+
*/
7654+
"errorText"?: string;
76037655
/**
76047656
* The toggle icon to show when the select is open. If defined, the icon rotation behavior in `md` mode will be disabled. If undefined, `toggleIcon` will be used for when the select is both open and closed.
76057657
*/
@@ -7608,6 +7660,10 @@ declare namespace LocalJSX {
76087660
* The fill for the item. If `"solid"` the item will have a background. If `"outline"` the item will be transparent with a border. Only available in `md` mode.
76097661
*/
76107662
"fill"?: 'outline' | 'solid';
7663+
/**
7664+
* Text that is placed under the select and displayed when no error is detected.
7665+
*/
7666+
"helperText"?: string;
76117667
/**
76127668
* The interface the select should use: `action-sheet`, `popover`, `alert`, or `modal`.
76137669
*/
@@ -8163,6 +8219,14 @@ declare namespace LocalJSX {
81638219
* Enables the on/off accessibility switch labels within the toggle.
81648220
*/
81658221
"enableOnOffLabels"?: boolean | undefined;
8222+
/**
8223+
* Text that is placed under the toggle label and displayed when an error is detected.
8224+
*/
8225+
"errorText"?: string;
8226+
/**
8227+
* Text that is placed under the toggle label and displayed when no error is detected.
8228+
*/
8229+
"helperText"?: string;
81668230
/**
81678231
* How to pack the label and toggle within a line. `"start"`: The label and toggle will appear on the left in LTR and on the right in RTL. `"end"`: The label and toggle will appear on the right in LTR and on the left in RTL. `"space-between"`: The label and toggle will appear on opposite ends of the line with space between the two elements. Setting this property will change the toggle `display` to `block`.
81688232
*/

0 commit comments

Comments
 (0)