@wavemaker/app-ng-runtime 11.5.2-next.141051 → 11.5.2-next.141052
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- app-ng-runtime/components/data/form/bundles/index.umd.js +1 -1
- app-ng-runtime/components/data/form/esm2020/form-field/form-field.directive.mjs +2 -2
- app-ng-runtime/components/data/form/fesm2015/index.mjs +1 -1
- app-ng-runtime/components/data/form/fesm2015/index.mjs.map +1 -1
- app-ng-runtime/components/data/form/fesm2020/index.mjs +1 -1
- app-ng-runtime/components/data/form/fesm2020/index.mjs.map +1 -1
- app-ng-runtime/components/input/default/bundles/index.umd.js +10 -3
- app-ng-runtime/components/input/default/esm2020/select/select.component.mjs +11 -4
- app-ng-runtime/components/input/default/fesm2015/index.mjs +10 -3
- app-ng-runtime/components/input/default/fesm2015/index.mjs.map +1 -1
- app-ng-runtime/components/input/default/fesm2020/index.mjs +10 -3
- app-ng-runtime/components/input/default/fesm2020/index.mjs.map +1 -1
- app-ng-runtime/components/input/default/select/select.component.d.ts +1 -0
- app-ng-runtime/package.json +1 -1
|
@@ -2355,8 +2355,15 @@
|
|
|
2355
2355
|
}
|
|
2356
2356
|
super.onPropertyChange(key, nv, ov);
|
|
2357
2357
|
}
|
|
2358
|
+
isSafariBrowser() {
|
|
2359
|
+
var reg = {
|
|
2360
|
+
MAC: /Mac/i,
|
|
2361
|
+
MACINTEL: /MacIntel/i
|
|
2362
|
+
};
|
|
2363
|
+
return reg.MAC.test(window.navigator.platform) || reg.MACINTEL.test(window.navigator.platform);
|
|
2364
|
+
}
|
|
2358
2365
|
isIosPlatform() {
|
|
2359
|
-
return i1$1.isIos();
|
|
2366
|
+
return i1$1.isIos() || this.isSafariBrowser();
|
|
2360
2367
|
}
|
|
2361
2368
|
/**
|
|
2362
2369
|
* When caption floating is enabled and placeholder is given, do not show placeholder until user focuses on the field
|
|
@@ -2367,8 +2374,8 @@
|
|
|
2367
2374
|
checkForFloatingLabel($event) {
|
|
2368
2375
|
const captionEl = $(this.selectEl.nativeElement).closest('.app-composite-widget.caption-floating');
|
|
2369
2376
|
if (captionEl.length > 0) {
|
|
2370
|
-
if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || this.datavalue || this.isIosPlatform())))) {
|
|
2371
|
-
if (!$event && (this.placeholder || this.datavalue || this.isIosPlatform())) {
|
|
2377
|
+
if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || (this.datavalue || this.binddatavalue) || this.isIosPlatform())))) {
|
|
2378
|
+
if (!$event && (this.placeholder || this.datavalue || this.binddatavalue || this.isIosPlatform())) {
|
|
2372
2379
|
this.app.notify('captionPositionAnimate', { isSelect: true, nativeEl: captionEl });
|
|
2373
2380
|
}
|
|
2374
2381
|
if (this.placeholder) {
|
|
@@ -121,8 +121,15 @@ export class SelectComponent extends DatasetAwareFormComponent {
|
|
|
121
121
|
}
|
|
122
122
|
super.onPropertyChange(key, nv, ov);
|
|
123
123
|
}
|
|
124
|
+
isSafariBrowser() {
|
|
125
|
+
var reg = {
|
|
126
|
+
MAC: /Mac/i,
|
|
127
|
+
MACINTEL: /MacIntel/i
|
|
128
|
+
};
|
|
129
|
+
return reg.MAC.test(window.navigator.platform) || reg.MACINTEL.test(window.navigator.platform);
|
|
130
|
+
}
|
|
124
131
|
isIosPlatform() {
|
|
125
|
-
return isIos();
|
|
132
|
+
return isIos() || this.isSafariBrowser();
|
|
126
133
|
}
|
|
127
134
|
/**
|
|
128
135
|
* When caption floating is enabled and placeholder is given, do not show placeholder until user focuses on the field
|
|
@@ -133,8 +140,8 @@ export class SelectComponent extends DatasetAwareFormComponent {
|
|
|
133
140
|
checkForFloatingLabel($event) {
|
|
134
141
|
const captionEl = $(this.selectEl.nativeElement).closest('.app-composite-widget.caption-floating');
|
|
135
142
|
if (captionEl.length > 0) {
|
|
136
|
-
if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || this.datavalue || this.isIosPlatform())))) {
|
|
137
|
-
if (!$event && (this.placeholder || this.datavalue || this.isIosPlatform())) {
|
|
143
|
+
if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || (this.datavalue || this.binddatavalue) || this.isIosPlatform())))) {
|
|
144
|
+
if (!$event && (this.placeholder || this.datavalue || this.binddatavalue || this.isIosPlatform())) {
|
|
138
145
|
this.app.notify('captionPositionAnimate', { isSelect: true, nativeEl: captionEl });
|
|
139
146
|
}
|
|
140
147
|
if (this.placeholder) {
|
|
@@ -191,4 +198,4 @@ SelectComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SelectCompo
|
|
|
191
198
|
type: ViewChild,
|
|
192
199
|
args: ['select', { static: true, read: ElementRef }]
|
|
193
200
|
}] }); })();
|
|
194
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"select.component.js","sourceRoot":"","sources":["../../../../../../projects/components/widgets/input/default/src/select/select.component.ts","../../../../../../projects/components/widgets/input/default/src/select/select.component.html"],"names":[],"mappings":"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","sourcesContent":["import {AfterViewInit, Component, ElementRef, Injector, Optional, ViewChild} from '@angular/core';\nimport { NG_VALUE_ACCESSOR, NG_VALIDATORS } from '@angular/forms';\n\nimport {DataSource, removeAttr, setAttr, App, isIos} from '@wm/core';\nimport { provideAsWidgetRef, provideAs, styler } from '@wm/components/base';\nimport { DatasetAwareFormComponent } from '../dataset-aware-form.component';\n\nimport { registerProps } from './select.props';\n\ndeclare const _;\n\nconst WIDGET_CONFIG = {widgetType: 'wm-select', hostClass: 'app-select-wrapper'};\n\n@Component({\n    selector: 'wm-select',\n    templateUrl: './select.component.html',\n    providers: [\n        provideAs(SelectComponent, NG_VALUE_ACCESSOR, true),\n        provideAs(SelectComponent, NG_VALIDATORS, true),\n        provideAsWidgetRef(SelectComponent)\n    ]\n})\nexport class SelectComponent extends DatasetAwareFormComponent implements AfterViewInit {\n    static initializeProps = registerProps();\n\n    public readonly: boolean;\n    public placeholder: string;\n    public navsearchbar: any;\n    public class: any;\n    public required: boolean;\n    public disabled: boolean;\n    public tabindex: any;\n    public name: string;\n    public autofocus: boolean;\n    public hint: string;\n    private app: App;\n\n    @ViewChild('select', { static: true, read: ElementRef }) selectEl: ElementRef;\n\n    set datasource(ds) {\n        if (ds && ds.execute && ds.execute(DataSource.Operation.IS_BOUND_TO_LOCALE)) {\n            this.datavalue = ds.execute(DataSource.Operation.GET_DEFAULT_LOCALE);\n        }\n    }\n\n    constructor(inj: Injector,  app: App) {\n        super(inj, WIDGET_CONFIG);\n        this.app = app;\n        this.acceptsArray = true;\n    }\n\n    ngAfterViewInit() {\n        super.ngAfterViewInit();\n        styler(this.selectEl.nativeElement as HTMLElement, this);\n        setTimeout(() => {\n            this.checkForFloatingLabel(null);\n        }, 10)\n\n    }\n\n    // Change event is registered from the template, Prevent the framework from registering one more event\n    protected handleEvent(node: HTMLElement, eventName: string, eventCallback: Function, locals: any) {\n        if (!_.includes(['blur', 'change'], eventName)) {\n            super.handleEvent(this.selectEl.nativeElement, eventName, eventCallback, locals);\n        }\n    }\n\n    onSelectValueChange($event) {\n        if (this.readonly) {\n            if (this.placeholder) {\n                this.selectEl.nativeElement.value = this.placeholder;\n            } else {\n                this.selectEl.nativeElement.value = '';\n            }\n            this.datavalue = (this as any).prevDatavalue;\n            return;\n        }\n        this.invokeOnTouched();\n        // invoke on datavalue change.\n        this.invokeOnChange(this.datavalue, $event || {}, true);\n    }\n\n    onPropertyChange(key: string, nv: any, ov?: any) {\n        if (key === 'required')  {\n            this._onChange(this.datavalue);\n            return;\n        }\n        if (key === 'class' ||  key === 'tabindex') {\n            if(key === 'class') {\n                // After NG15 upgrade ng-invalid class is added even the field is valid, so we are removing the ng-invalid manually\n                const isNgUntouchedValid = this.selectEl.nativeElement.classList.contains('ng-untouched') && this.selectEl.nativeElement.classList.contains('ng-valid')\n                if(isNgUntouchedValid && nv.includes('ng-untouched') && nv.includes('ng-invalid')) {\n                    setTimeout(()=> {\n                        if(this.selectEl.nativeElement.classList.contains('ng-untouched') && this.selectEl.nativeElement.classList.contains('ng-valid') && this.selectEl.nativeElement.classList.contains('ng-invalid')) {\n                            this.selectEl.nativeElement.classList.remove('ng-invalid');\n                        }\n                    });\n                }\n            }\n            return;\n        } else if (key === 'readonly') {\n             (nv === true) ? setAttr(this.selectEl.nativeElement, 'readonly', 'readonly') : removeAttr(this.selectEl.nativeElement, 'readonly') ;\n        }\n        super.onPropertyChange(key, nv, ov);\n    }\n\n    isIosPlatform() {\n        return isIos();\n    }\n    /**\n     * When caption floating is enabled and placeholder is given, do not show placeholder until user focuses on the field\n     * When focused add the placeholder to the option which is selected\n     * On blur, remove the placeholder and do not animate the label\n     * @param $event event received will be either a blur or focus event\n     */\n    checkForFloatingLabel($event) {\n        const captionEl = $(this.selectEl.nativeElement).closest('.app-composite-widget.caption-floating');\n        if (captionEl.length > 0) {\n            if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || this.datavalue || this.isIosPlatform())))) {\n                if(!$event && (this.placeholder || this.datavalue || this.isIosPlatform())){\n                    this.app.notify('captionPositionAnimate', {isSelect: true, nativeEl: captionEl});\n                }\n                if(this.placeholder) {\n                    $(this.selectEl.nativeElement).find('option:first').text(this.placeholder);\n                }\n            }\n            else if (!this.datavalue) {\n                if(!this.placeholder) {\n                  //  $(this.selectEl.nativeElement).find('option:first').text('');\n                    if(!this.isIosPlatform()) {\n                        captionEl.removeClass('float-active');\n                    }\n                }\n\n            }\n        }\n    }\n}\n","<select role=\"listbox\" aria-haspopup=\"true\" aria-expanded=\"false\" #select\n        focus-target\n        [ngClass]=\"['app-select form-control', class]\"\n        [disabled]=\"disabled\"\n        [required]=\"required\"\n        [tabindex]=\"tabindex\"\n        [(ngModel)]=\"modelByKey\"\n        [multiple]=\"multiple\"\n        (change)=\"onSelectValueChange($event)\"\n        (focus)=\"checkForFloatingLabel($event)\"\n        (blur)=\"invokeOnTouched($event); checkForFloatingLabel($event)\"\n        [attr.name]=\"name\"\n        [attr.aria-label]=\"hint\"\n        [attr.aria-multiselectable]=\"multiple\"\n        [autofocus]=\"autofocus\"\n>\n    <option\n    value=\"undefined\"\n    [textContent]=\"placeholder\"\n            *ngIf=\"!isIosPlatform() || !!placeholder\"\n    [hidden]=\"!placeholder\"></option>\n\n    <ng-container *ngIf=\"groupby\">\n        <optgroup *ngFor=\"let groupObj of groupedData\"\n            [label]=\"groupObj.key\">\n            <option *ngFor=\"let item of groupObj.data;\"\n                [value]=\"item.key\"\n                [selected]=\"item.selected\"\n                [textContent]=\"item.label\"\n                role=\"option\"></option>\n        </optgroup>\n    </ng-container>\n\n    <ng-container *ngIf=\"!groupby\">\n        <option *ngFor=\"let item of datasetItems\"\n            [value]=\"item.key\"\n            [selected]=\"item.selected\"\n            [textContent]=\"item.label\"\n            role=\"option\"></option>\n    </ng-container>\n</select>\n"]}
|
|
201
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"select.component.js","sourceRoot":"","sources":["../../../../../../projects/components/widgets/input/default/src/select/select.component.ts","../../../../../../projects/components/widgets/input/default/src/select/select.component.html"],"names":[],"mappings":"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","sourcesContent":["import {AfterViewInit, Component, ElementRef, Injector, Optional, ViewChild} from '@angular/core';\nimport { NG_VALUE_ACCESSOR, NG_VALIDATORS } from '@angular/forms';\n\nimport {DataSource, removeAttr, setAttr, App, isIos} from '@wm/core';\nimport { provideAsWidgetRef, provideAs, styler } from '@wm/components/base';\nimport { DatasetAwareFormComponent } from '../dataset-aware-form.component';\n\nimport { registerProps } from './select.props';\n\ndeclare const _;\n\nconst WIDGET_CONFIG = {widgetType: 'wm-select', hostClass: 'app-select-wrapper'};\n\n@Component({\n    selector: 'wm-select',\n    templateUrl: './select.component.html',\n    providers: [\n        provideAs(SelectComponent, NG_VALUE_ACCESSOR, true),\n        provideAs(SelectComponent, NG_VALIDATORS, true),\n        provideAsWidgetRef(SelectComponent)\n    ]\n})\nexport class SelectComponent extends DatasetAwareFormComponent implements AfterViewInit {\n    static initializeProps = registerProps();\n\n    public readonly: boolean;\n    public placeholder: string;\n    public navsearchbar: any;\n    public class: any;\n    public required: boolean;\n    public disabled: boolean;\n    public tabindex: any;\n    public name: string;\n    public autofocus: boolean;\n    public hint: string;\n    private app: App;\n\n    @ViewChild('select', { static: true, read: ElementRef }) selectEl: ElementRef;\n\n    set datasource(ds) {\n        if (ds && ds.execute && ds.execute(DataSource.Operation.IS_BOUND_TO_LOCALE)) {\n            this.datavalue = ds.execute(DataSource.Operation.GET_DEFAULT_LOCALE);\n        }\n    }\n\n    constructor(inj: Injector,  app: App) {\n        super(inj, WIDGET_CONFIG);\n        this.app = app;\n        this.acceptsArray = true;\n    }\n\n    ngAfterViewInit() {\n        super.ngAfterViewInit();\n        styler(this.selectEl.nativeElement as HTMLElement, this);\n        setTimeout(() => {\n            this.checkForFloatingLabel(null);\n        }, 10)\n\n    }\n\n    // Change event is registered from the template, Prevent the framework from registering one more event\n    protected handleEvent(node: HTMLElement, eventName: string, eventCallback: Function, locals: any) {\n        if (!_.includes(['blur', 'change'], eventName)) {\n            super.handleEvent(this.selectEl.nativeElement, eventName, eventCallback, locals);\n        }\n    }\n\n    onSelectValueChange($event) {\n        if (this.readonly) {\n            if (this.placeholder) {\n                this.selectEl.nativeElement.value = this.placeholder;\n            } else {\n                this.selectEl.nativeElement.value = '';\n            }\n            this.datavalue = (this as any).prevDatavalue;\n            return;\n        }\n        this.invokeOnTouched();\n        // invoke on datavalue change.\n        this.invokeOnChange(this.datavalue, $event || {}, true);\n    }\n\n    onPropertyChange(key: string, nv: any, ov?: any) {\n        if (key === 'required')  {\n            this._onChange(this.datavalue);\n            return;\n        }\n        if (key === 'class' ||  key === 'tabindex') {\n            if(key === 'class') {\n                // After NG15 upgrade ng-invalid class is added even the field is valid, so we are removing the ng-invalid manually\n                const isNgUntouchedValid = this.selectEl.nativeElement.classList.contains('ng-untouched') && this.selectEl.nativeElement.classList.contains('ng-valid')\n                if(isNgUntouchedValid && nv.includes('ng-untouched') && nv.includes('ng-invalid')) {\n                    setTimeout(()=> {\n                        if(this.selectEl.nativeElement.classList.contains('ng-untouched') && this.selectEl.nativeElement.classList.contains('ng-valid') && this.selectEl.nativeElement.classList.contains('ng-invalid')) {\n                            this.selectEl.nativeElement.classList.remove('ng-invalid');\n                        }\n                    });\n                }\n            }\n            return;\n        } else if (key === 'readonly') {\n             (nv === true) ? setAttr(this.selectEl.nativeElement, 'readonly', 'readonly') : removeAttr(this.selectEl.nativeElement, 'readonly') ;\n        }\n        super.onPropertyChange(key, nv, ov);\n    }\n\n    isSafariBrowser()  {\n        var reg = {\n            MAC: /Mac/i,\n            MACINTEL: /MacIntel/i\n        }\n        return reg.MAC.test(window.navigator.platform) || reg.MACINTEL.test(window.navigator.platform);\n    }\n\n    isIosPlatform() {\n        return isIos() || this.isSafariBrowser();\n    }\n    /**\n     * When caption floating is enabled and placeholder is given, do not show placeholder until user focuses on the field\n     * When focused add the placeholder to the option which is selected\n     * On blur, remove the placeholder and do not animate the label\n     * @param $event event received will be either a blur or focus event\n     */\n    checkForFloatingLabel($event) {\n        const captionEl = $(this.selectEl.nativeElement).closest('.app-composite-widget.caption-floating');\n        if (captionEl.length > 0) {\n            if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || (this.datavalue || this.binddatavalue) || this.isIosPlatform())))) {\n                if(!$event && (this.placeholder || this.datavalue || this.binddatavalue || this.isIosPlatform())){\n                    this.app.notify('captionPositionAnimate', {isSelect: true, nativeEl: captionEl});\n                }\n                if(this.placeholder) {\n                    $(this.selectEl.nativeElement).find('option:first').text(this.placeholder);\n                }\n            }\n            else if (!this.datavalue) {\n                if(!this.placeholder) {\n                  //  $(this.selectEl.nativeElement).find('option:first').text('');\n                    if(!this.isIosPlatform()) {\n                        captionEl.removeClass('float-active');\n                    }\n                }\n\n            }\n        }\n    }\n}\n","<select role=\"listbox\" aria-haspopup=\"true\" aria-expanded=\"false\" #select\n        focus-target\n        [ngClass]=\"['app-select form-control', class]\"\n        [disabled]=\"disabled\"\n        [required]=\"required\"\n        [tabindex]=\"tabindex\"\n        [(ngModel)]=\"modelByKey\"\n        [multiple]=\"multiple\"\n        (change)=\"onSelectValueChange($event)\"\n        (focus)=\"checkForFloatingLabel($event)\"\n        (blur)=\"invokeOnTouched($event); checkForFloatingLabel($event)\"\n        [attr.name]=\"name\"\n        [attr.aria-label]=\"hint\"\n        [attr.aria-multiselectable]=\"multiple\"\n        [autofocus]=\"autofocus\"\n>\n    <option\n    value=\"undefined\"\n    [textContent]=\"placeholder\"\n            *ngIf=\"!isIosPlatform() || !!placeholder\"\n    [hidden]=\"!placeholder\"></option>\n\n    <ng-container *ngIf=\"groupby\">\n        <optgroup *ngFor=\"let groupObj of groupedData\"\n            [label]=\"groupObj.key\">\n            <option *ngFor=\"let item of groupObj.data;\"\n                [value]=\"item.key\"\n                [selected]=\"item.selected\"\n                [textContent]=\"item.label\"\n                role=\"option\"></option>\n        </optgroup>\n    </ng-container>\n\n    <ng-container *ngIf=\"!groupby\">\n        <option *ngFor=\"let item of datasetItems\"\n            [value]=\"item.key\"\n            [selected]=\"item.selected\"\n            [textContent]=\"item.label\"\n            role=\"option\"></option>\n    </ng-container>\n</select>\n"]}
|
|
@@ -2339,8 +2339,15 @@ class SelectComponent extends DatasetAwareFormComponent {
|
|
|
2339
2339
|
}
|
|
2340
2340
|
super.onPropertyChange(key, nv, ov);
|
|
2341
2341
|
}
|
|
2342
|
+
isSafariBrowser() {
|
|
2343
|
+
var reg = {
|
|
2344
|
+
MAC: /Mac/i,
|
|
2345
|
+
MACINTEL: /MacIntel/i
|
|
2346
|
+
};
|
|
2347
|
+
return reg.MAC.test(window.navigator.platform) || reg.MACINTEL.test(window.navigator.platform);
|
|
2348
|
+
}
|
|
2342
2349
|
isIosPlatform() {
|
|
2343
|
-
return isIos();
|
|
2350
|
+
return isIos() || this.isSafariBrowser();
|
|
2344
2351
|
}
|
|
2345
2352
|
/**
|
|
2346
2353
|
* When caption floating is enabled and placeholder is given, do not show placeholder until user focuses on the field
|
|
@@ -2351,8 +2358,8 @@ class SelectComponent extends DatasetAwareFormComponent {
|
|
|
2351
2358
|
checkForFloatingLabel($event) {
|
|
2352
2359
|
const captionEl = $(this.selectEl.nativeElement).closest('.app-composite-widget.caption-floating');
|
|
2353
2360
|
if (captionEl.length > 0) {
|
|
2354
|
-
if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || this.datavalue || this.isIosPlatform())))) {
|
|
2355
|
-
if (!$event && (this.placeholder || this.datavalue || this.isIosPlatform())) {
|
|
2361
|
+
if ((!$event || $event.type === 'focus') && (($(this.selectEl).find('select option:selected').text() === '' && (this.placeholder || (this.datavalue || this.binddatavalue) || this.isIosPlatform())))) {
|
|
2362
|
+
if (!$event && (this.placeholder || this.datavalue || this.binddatavalue || this.isIosPlatform())) {
|
|
2356
2363
|
this.app.notify('captionPositionAnimate', { isSelect: true, nativeEl: captionEl });
|
|
2357
2364
|
}
|
|
2358
2365
|
if (this.placeholder) {
|