Skip to content

Commit f38b7eb

Browse files
author
Nicolas Naso
committed
fix(select-modal): rename closeText to cancelText
1 parent 0c5497d commit f38b7eb

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

core/src/components.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,7 +2862,7 @@ export namespace Components {
28622862
"value"?: any | null;
28632863
}
28642864
interface IonSelectModal {
2865-
"closeText"?: string;
2865+
"cancelText"?: string;
28662866
"header"?: string;
28672867
"multiple"?: boolean;
28682868
"options": SelectModalOption[];
@@ -7743,7 +7743,7 @@ declare namespace LocalJSX {
77437743
"value"?: any | null;
77447744
}
77457745
interface IonSelectModal {
7746-
"closeText"?: string;
7746+
"cancelText"?: string;
77477747
"header"?: string;
77487748
"multiple"?: boolean;
77497749
"options"?: SelectModalOption[];

core/src/components/select-modal/select-modal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class SelectModal implements ComponentInterface {
2323

2424
@Prop() header?: string;
2525

26-
@Prop() closeText?: string;
26+
@Prop() cancelText?: string;
2727

2828
@Prop() multiple?: boolean;
2929

@@ -151,7 +151,7 @@ export class SelectModal implements ComponentInterface {
151151
{this.header !== undefined && <ion-title>{this.header}</ion-title>}
152152

153153
<ion-buttons slot="end">
154-
<ion-button onClick={() => this.closeModal()}>{this.closeText || 'Close'}</ion-button>
154+
<ion-button onClick={() => this.closeModal()}>{this.cancelText || 'Close'}</ion-button>
155155
</ion-buttons>
156156
</ion-toolbar>
157157
</ion-header>

core/src/components/select-modal/test/custom-close-text/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<ion-content>
2626
<ion-modal is-open="true">
27-
<ion-select-modal multiple="false" close-text="Close me"></ion-select-modal>
27+
<ion-select-modal multiple="false" cancel-text="Close me"></ion-select-modal>
2828
</ion-modal>
2929
</ion-content>
3030
</ion-app>

core/src/components/select-modal/test/fixtures.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class SelectModalPage {
3131
const selectModal = document.querySelector('ion-select-modal');
3232
selectModal.options = ${JSON.stringify(options)};
3333
selectModal.multiple = ${multiple};
34-
selectModal.closeText = 'Close me';
34+
selectModal.cancelText = 'Close me';
3535
</script>
3636
`,
3737
config

core/src/components/select/select.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { ComponentInterface, EventEmitter } from '@stencil/core';
2-
import { Component, Element, Event, Host, Method, Prop, State, Watch, h, forceUpdate } from '@stencil/core';
2+
import { Component, Element, Event, Host, Method, Prop, State, Watch, forceUpdate, h } from '@stencil/core';
33
import type { NotchController } from '@utils/forms';
44
import { compareOptions, createNotchController, isOptionSelected } from '@utils/forms';
5-
import { focusVisibleElement, renderHiddenInput, inheritAttributes } from '@utils/helpers';
65
import type { Attributes } from '@utils/helpers';
7-
import { actionSheetController, alertController, popoverController, modalController } from '@utils/overlays';
6+
import { focusVisibleElement, inheritAttributes, renderHiddenInput } from '@utils/helpers';
7+
import { actionSheetController, alertController, modalController, popoverController } from '@utils/overlays';
88
import type { OverlaySelect } from '@utils/overlays-interface';
99
import { isRTL } from '@utils/rtl';
1010
import { createColorClasses, hostContext } from '@utils/theme';
@@ -17,15 +17,15 @@ import type {
1717
AlertOptions,
1818
Color,
1919
CssClassMap,
20+
ModalOptions,
2021
PopoverOptions,
2122
StyleEventDetail,
22-
ModalOptions,
2323
} from '../../interface';
2424
import type { ActionSheetButton } from '../action-sheet/action-sheet-interface';
2525
import type { AlertInput } from '../alert/alert-interface';
2626
import type { SelectPopoverOption } from '../select-popover/select-popover-interface';
2727

28-
import type { SelectChangeEventDetail, SelectInterface, SelectCompareFn } from './select-interface';
28+
import type { SelectChangeEventDetail, SelectCompareFn, SelectInterface } from './select-interface';
2929

3030
// TODO(FW-2832): types
3131

@@ -724,7 +724,7 @@ export class Select implements ComponentInterface {
724724
component: 'ion-select-modal',
725725
componentProps: {
726726
header: interfaceOptions.header,
727-
closeText: interfaceOptions.closeText,
727+
cancelText: this.cancelText,
728728
multiple,
729729
value,
730730
options: this.createOverlaySelectOptions(this.childOpts, value),

packages/angular/src/directives/proxies.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,14 +2109,14 @@ This event will not emit when programmatically setting the `value` property.
21092109

21102110

21112111
@ProxyCmp({
2112-
inputs: ['closeText', 'header', 'multiple', 'options']
2112+
inputs: ['cancelText', 'header', 'multiple', 'options']
21132113
})
21142114
@Component({
21152115
selector: 'ion-select-modal',
21162116
changeDetection: ChangeDetectionStrategy.OnPush,
21172117
template: '<ng-content></ng-content>',
21182118
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
2119-
inputs: ['closeText', 'header', 'multiple', 'options'],
2119+
inputs: ['cancelText', 'header', 'multiple', 'options'],
21202120
})
21212121
export class IonSelectModal {
21222122
protected el: HTMLIonSelectModalElement;

packages/angular/standalone/src/directives/proxies.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,14 +1901,14 @@ export declare interface IonSegmentView extends Components.IonSegmentView {
19011901

19021902
@ProxyCmp({
19031903
defineCustomElementFn: defineIonSelectModal,
1904-
inputs: ['closeText', 'header', 'multiple', 'options']
1904+
inputs: ['cancelText', 'header', 'multiple', 'options']
19051905
})
19061906
@Component({
19071907
selector: 'ion-select-modal',
19081908
changeDetection: ChangeDetectionStrategy.OnPush,
19091909
template: '<ng-content></ng-content>',
19101910
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
1911-
inputs: ['closeText', 'header', 'multiple', 'options'],
1911+
inputs: ['cancelText', 'header', 'multiple', 'options'],
19121912
standalone: true
19131913
})
19141914
export class IonSelectModal {

packages/vue/src/proxies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ export const IonSelect: StencilVueComponent<JSX.IonSelect, JSX.IonSelect["value"
910910

911911
export const IonSelectModal: StencilVueComponent<JSX.IonSelectModal> = /*@__PURE__*/ defineContainer<JSX.IonSelectModal>('ion-select-modal', defineIonSelectModal, [
912912
'header',
913-
'closeText',
913+
'cancelText',
914914
'multiple',
915915
'options'
916916
]);

0 commit comments

Comments
 (0)