Skip to content

feat(color-picker): add eyeDropper prop, emit eyedropper-tap event #4558

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

Open
Lfan-ke wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(color-picker): add eyeDropper prop, emit eyedropper-tap event #4558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions packages/components/color-picker/color-picker.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,29 @@
}
}

.@{prefix}-color-picker {
&__eyedropper-wrap {
display: flex;
justify-content: flex-end;
padding: 8px 0 0;
}

&__eyedropper {
display: flex;
align-items: center;
justify-content: center;
width: 32px;
height: 32px;
font-size: 18px;
border-radius: 4px;
cursor: pointer;

&:active {
opacity: 0.7;
}
}
}

.transparentBgImage () {
/* stylelint-disable-next-line color-no-hex */
background-image:
Expand Down
6 changes: 6 additions & 0 deletions packages/components/color-picker/color-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,5 +398,11 @@ export default class ColorPicker extends SuperComponent {
onVisibleChange() {
this.close('overlay');
},

handleEyeDropperTap() {
this.triggerEvent('eyedropper-tap', {
color: getColorObject(this.color),
});
},
};
}
3 changes: 2 additions & 1 deletion packages/components/color-picker/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ export type ColorPickerChangeTrigger =
| 'palette-brightness'
| 'palette-hue-bar'
| 'palette-alpha-bar'
| 'preset';
| 'preset'
| 'eyedropper';
4 changes: 4 additions & 0 deletions packages/components/color-picker/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ const props: TdColorPickerProps = {
type: Boolean,
value: true,
},
eyeDropper: {
type: Boolean,
value: false,
},
/** 如果 color-picker 是在一个 `position:fixed` 的区域，需要显式指定属性 fixed 为 true */
fixed: {
type: Boolean,
Expand Down
4 changes: 4 additions & 0 deletions packages/components/color-picker/template.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
</view>
</view>

<view wx:if="{{eyeDropper && isMultiple}}" class="{{classPrefix}}__eyedropper-wrap">
<view class="{{classPrefix}}__eyedropper" catch:tap="handleEyeDropperTap">🎨</view>
</view>

<view class="{{classPrefix}}__format" wx:if="{{isMultiple}}">
<view class="{{classPrefix}}__format-item {{classPrefix}}__format-item--first"> {{format}} </view>
<view class="{{classPrefix}}__format-item {{classPrefix}}__format-item--second">
Expand Down
Loading