@wavemaker/angular-codegen 11.2.0-rc.5231 → 11.2.0-rc.5233

angular-codegen/angular-app/package.json

@@ -69,7 +69,7 @@
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
         "zone.js": "~0.11.4",
-        "@wavemaker/app-ng-runtime": "11.2.0-rc.5231"
+        "@wavemaker/app-ng-runtime": "11.2.0-rc.5233"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",

angular-codegen/dependencies/pipe-provider.cjs.js

@@ -46781,6 +46781,13 @@ const addForIdAttributes = (element) => {
             setAttr(labelEl[0], 'for', widgetId);
         }
     }
+    /*Adding aria-labelledby to radioset widget*/
+    const ulEl = element.querySelectorAll('ul');
+    if (labelEl.length && ulEl.length && ulEl[0].getAttribute('role') === 'radiogroup') {
+        const widgetId = 'wm-radioset-label-' + generateGUId();
+        setAttr(ulEl[0], 'aria-labelledby', widgetId);
+        setAttr(labelEl[0], 'id', widgetId);
+    }
 };
 /**
  * This method is used to adjust the container position

angular-codegen/dependencies/transpilation-mobile.cjs.js

@@ -40738,7 +40738,7 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
             tmpl = `<wm-input ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} type="password" aria-label="Enter password" ${updateOnTmpl}></wm-input>`;
             break;
         case FormWidgetType.RADIOSET:
-            tmpl = `<ul wmRadioset ${innerTmpl}></ul>`;
+            tmpl = `<ul role="radiogroup" wmRadioset ${innerTmpl}></ul>`;
             break;
         case FormWidgetType.RATING:
             tmpl = `<div wmRating ${innerTmpl}></div>`;
@@ -42859,6 +42859,13 @@ const addForIdAttributes = (element) => {
             setAttr(labelEl[0], 'for', widgetId);
         }
     }
+    /*Adding aria-labelledby to radioset widget*/
+    const ulEl = element.querySelectorAll('ul');
+    if (labelEl.length && ulEl.length && ulEl[0].getAttribute('role') === 'radiogroup') {
+        const widgetId = 'wm-radioset-label-' + generateGUId();
+        setAttr(ulEl[0], 'aria-labelledby', widgetId);
+        setAttr(labelEl[0], 'id', widgetId);
+    }
 };
 /**
  * This method is used to adjust the container position
@@ -45508,7 +45515,7 @@ register('wm-panel', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$j.nextUid();
-            return `<${tagName$1c} wmPanel #${counter}="wmPanel" partialContainer [attr.aria-label]="${counter}.hint || 'Panel'" wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$1c} wmPanel #${counter}="wmPanel" partialContainer wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1c}>`
     };
@@ -46058,7 +46065,7 @@ const registerFormField = (isFormField) => {
                                         [ngStyle]="{width: ${pCounter}.captionsize}" [ngClass]="{'text-danger': ${counter}._control?.invalid && ${counter}._control?.touched && ${pCounter}.isUpdateMode,
                                          required: ${pCounter}.isUpdateMode && ${counter}.required}" [textContent]="${counter}.displayname"> </label>
                             <div [ngClass]="${counter}.displayname ? ${pCounter}._widgetClass : '${controlLayout}'">
-                                 <label class="form-control-static app-label"
+                                 <label class="form-control-static app-label" *ngIf="!(${pCounter}.isUpdateMode || ${counter}.viewmodewidget === 'default' || ${counter}.widgettype === 'upload')"
                                        [hidden]="${pCounter}.isUpdateMode || ${counter}.viewmodewidget === 'default' || ${counter}.widgettype === 'upload'" [innerHTML]="${getCaptionByWidget(attrs, widgetType, counter)}"></label>
                                 ${getTemplate(attrs, widgetType, eventsTmpl, counter, pCounter, isInList)}
                                 <span aria-hidden="true" *ngIf="${counter}.showPendingSpinner" class="form-field-spinner fa fa-circle-o-notch fa-spin form-control-feedback"></span>
@@ -46415,7 +46422,7 @@ var number_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$K = 'ul';
 register('wm-radioset', () => {
     return {
-        pre: attrs => `<${tagName$K} wmRadioset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
+        pre: attrs => `<${tagName$K} role="radiogroup" wmRadioset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
         post: () => `</${tagName$K}>`
     };
 });

angular-codegen/dependencies/transpilation-web.cjs.js

@@ -40738,7 +40738,7 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
             tmpl = `<wm-input ${innerTmpl} ${attrs.get('required') === 'true' ? 'required=true' : ''} type="password" aria-label="Enter password" ${updateOnTmpl}></wm-input>`;
             break;
         case FormWidgetType.RADIOSET:
-            tmpl = `<ul wmRadioset ${innerTmpl}></ul>`;
+            tmpl = `<ul role="radiogroup" wmRadioset ${innerTmpl}></ul>`;
             break;
         case FormWidgetType.RATING:
             tmpl = `<div wmRating ${innerTmpl}></div>`;
@@ -42859,6 +42859,13 @@ const addForIdAttributes = (element) => {
             setAttr(labelEl[0], 'for', widgetId);
         }
     }
+    /*Adding aria-labelledby to radioset widget*/
+    const ulEl = element.querySelectorAll('ul');
+    if (labelEl.length && ulEl.length && ulEl[0].getAttribute('role') === 'radiogroup') {
+        const widgetId = 'wm-radioset-label-' + generateGUId();
+        setAttr(ulEl[0], 'aria-labelledby', widgetId);
+        setAttr(labelEl[0], 'id', widgetId);
+    }
 };
 /**
  * This method is used to adjust the container position
@@ -45508,7 +45515,7 @@ register('wm-panel', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$j.nextUid();
-            return `<${tagName$1c} wmPanel #${counter}="wmPanel" partialContainer [attr.aria-label]="${counter}.hint || 'Panel'" wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$1c} wmPanel #${counter}="wmPanel" partialContainer wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1c}>`
     };
@@ -46058,7 +46065,7 @@ const registerFormField = (isFormField) => {
                                         [ngStyle]="{width: ${pCounter}.captionsize}" [ngClass]="{'text-danger': ${counter}._control?.invalid && ${counter}._control?.touched && ${pCounter}.isUpdateMode,
                                          required: ${pCounter}.isUpdateMode && ${counter}.required}" [textContent]="${counter}.displayname"> </label>
                             <div [ngClass]="${counter}.displayname ? ${pCounter}._widgetClass : '${controlLayout}'">
-                                 <label class="form-control-static app-label"
+                                 <label class="form-control-static app-label" *ngIf="!(${pCounter}.isUpdateMode || ${counter}.viewmodewidget === 'default' || ${counter}.widgettype === 'upload')"
                                        [hidden]="${pCounter}.isUpdateMode || ${counter}.viewmodewidget === 'default' || ${counter}.widgettype === 'upload'" [innerHTML]="${getCaptionByWidget(attrs, widgetType, counter)}"></label>
                                 ${getTemplate(attrs, widgetType, eventsTmpl, counter, pCounter, isInList)}
                                 <span aria-hidden="true" *ngIf="${counter}.showPendingSpinner" class="form-field-spinner fa fa-circle-o-notch fa-spin form-control-feedback"></span>
@@ -46415,7 +46422,7 @@ var number_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$K = 'ul';
 register('wm-radioset', () => {
     return {
-        pre: attrs => `<${tagName$K} wmRadioset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
+        pre: attrs => `<${tagName$K} role="radiogroup" wmRadioset ${getFormMarkupAttr(attrs)} ${getChildAttrs(attrs)} ${getNgModelAttr(attrs)}>`,
         post: () => `</${tagName$K}>`
     };
 });

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.2.0-rc.5231",
+    "version": "11.2.0-rc.5233",
     "description": "",
     "main": "index.js",
     "scripts": {