From 7fc76ae38fb58380802e5c4735d471b6207545d0 Mon Sep 17 00:00:00 2001 From: yaogengzhu <455947455@qq.com> Date: Thu, 1 Dec 2022 23:21:30 +0800 Subject: [PATCH 1/2] feat(progress): support progress aria fix #1049 --- src/progress/progress.wxml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/progress/progress.wxml b/src/progress/progress.wxml index 36f2c83f4..ad0c623c4 100644 --- a/src/progress/progress.wxml +++ b/src/progress/progress.wxml @@ -1,6 +1,11 @@ From e1fc216277e84b1fb3cb39921f1287c3ae3dba72 Mon Sep 17 00:00:00 2001 From: yaogengzhu <455947455@qq.com> Date: Sat, 3 Dec 2022 15:54:43 +0800 Subject: [PATCH 2/2] fix(progress): add props add props --- src/common/src/instantiationDecorator.ts | 3 +++ src/progress/progress.wxml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/common/src/instantiationDecorator.ts b/src/common/src/instantiationDecorator.ts index 3bfd4556e..24c672aaa 100644 --- a/src/common/src/instantiationDecorator.ts +++ b/src/common/src/instantiationDecorator.ts @@ -42,6 +42,9 @@ export const toComponent = function toComponent(options: Record) { { key: 'ariaHidden', type: Boolean }, { key: 'ariaRole', type: String }, { key: 'ariaLabel', type: String }, + { key: 'ariaLabelledby', type: String }, + { key: 'ariaDescribedby', type: String }, + { key: 'ariaBusy', type: Boolean }, ]; ariaProps.forEach(({ key, type }) => { options.properties[key] = { diff --git a/src/progress/progress.wxml b/src/progress/progress.wxml index ad0c623c4..529e13049 100644 --- a/src/progress/progress.wxml +++ b/src/progress/progress.wxml @@ -6,6 +6,10 @@ aria-valuenow="{{computedProgress}}" aria-valuemin="0" aria-valuemax="100" + aria-label="{{ ariaLabel }}" + aria-labelledby="{{ ariaLabelledby }}" + aria-describedby="{{ ariaDescribedby }}" + aria-busy="{{ ariaBusy }}" class="{{ classPrefix }}__bar {{prefix}}-class-bar" style="height: {{ heightBar }}; background: {{ trackColor }}" >