Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cascader): support aria #1657

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

feat(cascader): support aria #1657

Changes from 3 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3a05f3e
feat(cascader): support aria
zhangpaopao0609 Feb 24, 2023
e0218f4
feat(cascader): label and hidden
zhangpaopao0609 Feb 24, 2023
c11335e
feat(cascader): hidden
zhangpaopao0609 Mar 6, 2023
9b89cff
feat(cascader): text change to option
zhangpaopao0609 Mar 24, 2023
964b3a0
feat(cascader): add index label
zhangpaopao0609 Mar 24, 2023
67e27a3
chore: Merge branch 'develop' into feature/cascader-aria
zhangpaopao0609 Mar 24, 2023
281dce9
feat(cascader): change dom to no-dom
zhangpaopao0609 Apr 10, 2023
7a016fd
chore(cascader): update sanp
zhangpaopao0609 Apr 10, 2023
3418f11
chore: Merge branch 'develop' into feature/cascader-aria
zhangpaopao0609 Apr 10, 2023
202d86d
feat(cascader): placement
zhangpaopao0609 Apr 10, 2023
53ad712
chore(cascader): update sanp
zhangpaopao0609 Apr 10, 2023
d31f070
chore: merge develop
zhangpaopao0609 May 30, 2023
36e5768
refactor(cascader): optimization
zhangpaopao0609 May 30, 2023
f857cd0
fix: babel transform-class-properties
zhangpaopao0609 May 30, 2023
1857468
chore: merge develop
zhangpaopao0609 May 30, 2023
ee78c88
chore: merge develop for fix conflict
zhangpaopao0609 May 30, 2023
225481e
chore: update snap
zhangpaopao0609 May 30, 2023
c0f904f
chore: update snap
zhangpaopao0609 May 30, 2023
8cfa50a
chore: merge develop
zhangpaopao0609 Jul 14, 2023
3f2b8f0
chore: update snap
zhangpaopao0609 Jul 14, 2023
ccb3db7
feat(cascader): icon hidden
zhangpaopao0609 Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/cascader/cascader.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,20 @@
</view>
<view class="{{name}}__close-btn" bind:tap="hide">
<slot name="close-btn" />
<t-icon wx:if="{{closeBtn}}" size="24" name="close" />
<t-icon wx:if="{{closeBtn}}" aria-role="button" aria-label="关闭" size="24" name="close" />
</view>
<view class="{{name}}__content">
<block wx:if="{{steps && steps.length}}">
<view wx:if="{{theme == 'step'}}" class="{{name}}__steps">
<view wx:for="{{steps}}" wx:key="index" class="{{name}}__step" bind:tap="onStepClick" data-index="{{index}}">
<view
wx:for="{{steps}}"
wx:key="index"
class="{{name}}__step"
bind:tap="onStepClick"
data-index="{{index}}"
aria-role="{{ item === defaultOptionLabel ? 'text' : 'button' }}"
zhangpaopao0609 marked this conversation as resolved.
Show resolved Hide resolved
aria-label="{{ item === defaultOptionLabel ? item : '已选中,' + item }}"
>
<view
class="{{name}}__step-dot {{name}}__step-dot--{{item !== defaultOptionLabel ? 'active' : ''}} {{name}}__step-dot--{{index === steps.length - 1 ? 'last' : ''}}"
></view>
Expand All @@ -29,9 +37,9 @@
</t-tabs>
</block>
</block>
<view wx:if="{{ subTitles && subTitles[stepIndex] }}" class="{{name}}__options-title"
>{{subTitles[stepIndex]}}</view
>
<view wx:if="{{ subTitles && subTitles[stepIndex] }}" class="{{name}}__options-title">
{{subTitles[stepIndex]}}
</view>
<view
class="{{name}}__options-container"
style="width: {{items.length + 1}}00vw; transform: translateX(-{{stepIndex}}00vw)"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个style去掉了，符合预期吗

Expand All @@ -44,7 +52,7 @@
scroll-y
scroll-top="{{scrollTopList[index]}}"
>
<view class="cascader-radio-group-{{index}}">
<view class="cascader-radio-group-{{index}}" aria-hidden="{{ stepIndex !== index}}">
<t-radio-group
value="{{selectedValue[index]}}"
keys="{{keys}}"
Expand Down