antd-mobile 5.16.1 → 5.17.2
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.
- package/2x/README.md +2 -0
- package/2x/bundle/antd-mobile.cjs.js +3411 -3359
- package/2x/bundle/antd-mobile.es.js +3412 -3360
- package/2x/bundle/style.css +102 -40
- package/2x/cjs/components/button/button.css +1 -0
- package/2x/cjs/components/calendar/calendar.js +2 -2
- package/2x/cjs/components/cascader/cascader.js +1 -1
- package/2x/cjs/components/cascader-view/cascader-view.js +7 -3
- package/2x/cjs/components/date-picker/date-picker.d.ts +2 -2
- package/2x/cjs/components/date-picker/date-picker.js +3 -1
- package/2x/cjs/components/date-picker/index.d.ts +1 -1
- package/2x/cjs/components/date-picker-view/date-picker-view.d.ts +1 -1
- package/2x/cjs/components/date-picker-view/date-picker-view.js +2 -0
- package/2x/cjs/components/dialog/dialog.css +1 -0
- package/2x/cjs/components/dropdown/dropdown.css +2 -2
- package/2x/cjs/components/empty/empty.css +1 -0
- package/2x/cjs/components/floating-bubble/floating-bubble.css +1 -0
- package/2x/cjs/components/floating-panel/floating-panel.css +7 -4
- package/2x/cjs/components/form/form-item.css +1 -0
- package/2x/cjs/components/form/index.css +1 -0
- package/2x/cjs/components/grid/grid.css +1 -0
- package/2x/cjs/components/image/image.d.ts +1 -0
- package/2x/cjs/components/image/image.js +2 -1
- package/2x/cjs/components/image/test/image.test.d.ts +1 -0
- package/2x/cjs/components/image/test/image.test.js +34 -0
- package/2x/cjs/components/image-viewer/image-viewer.css +3 -0
- package/2x/cjs/components/index-bar/index-bar.css +2 -0
- package/2x/cjs/components/input/input.css +6 -0
- package/2x/cjs/components/jumbo-tabs/jumbo-tabs.css +2 -0
- package/2x/cjs/components/modal/modal.css +1 -0
- package/2x/cjs/components/number-keyboard/number-keyboard.css +3 -2
- package/2x/cjs/components/passcode-input/passcode-input.css +1 -1
- package/2x/cjs/components/picker/index.d.ts +4 -0
- package/2x/cjs/components/picker/picker.css +6 -0
- package/2x/cjs/components/picker/picker.d.ts +4 -0
- package/2x/cjs/components/picker/picker.js +7 -3
- package/2x/cjs/components/picker-view/picker-view.css +17 -3
- package/2x/cjs/components/picker-view/picker-view.d.ts +2 -0
- package/2x/cjs/components/picker-view/picker-view.js +10 -3
- package/2x/cjs/components/picker-view/wheel.js +1 -1
- package/2x/cjs/components/popover/popover.css +2 -0
- package/2x/cjs/components/result/result.css +1 -1
- package/2x/cjs/components/side-bar/side-bar.css +1 -0
- package/2x/cjs/components/slider/slider.css +4 -0
- package/2x/cjs/components/swipe-action/swipe-action.css +1 -0
- package/2x/cjs/components/swiper/swiper.css +1 -0
- package/2x/cjs/components/tab-bar/tab-bar.css +1 -0
- package/2x/cjs/components/tabs/tabs.css +1 -0
- package/2x/cjs/components/text-area/text-area.css +6 -0
- package/2x/cjs/global/global.css +1 -0
- package/2x/cjs/utils/use-props-value.d.ts +1 -1
- package/2x/cjs/utils/use-props-value.js +3 -1
- package/2x/cjs/utils/use-tab-list-scroll.js +1 -1
- package/2x/es/components/button/button.css +1 -0
- package/2x/es/components/calendar/calendar.js +2 -2
- package/2x/es/components/cascader/cascader.js +1 -1
- package/2x/es/components/cascader-view/cascader-view.js +6 -3
- package/2x/es/components/date-picker/date-picker.d.ts +2 -2
- package/2x/es/components/date-picker/date-picker.js +3 -1
- package/2x/es/components/date-picker/index.d.ts +1 -1
- package/2x/es/components/date-picker-view/date-picker-view.d.ts +1 -1
- package/2x/es/components/date-picker-view/date-picker-view.js +2 -0
- package/2x/es/components/dialog/dialog.css +1 -0
- package/2x/es/components/dropdown/dropdown.css +2 -2
- package/2x/es/components/empty/empty.css +1 -0
- package/2x/es/components/floating-bubble/floating-bubble.css +1 -0
- package/2x/es/components/floating-panel/floating-panel.css +7 -4
- package/2x/es/components/form/form-item.css +1 -0
- package/2x/es/components/form/index.css +1 -0
- package/2x/es/components/grid/grid.css +1 -0
- package/2x/es/components/image/image.d.ts +1 -0
- package/2x/es/components/image/image.js +2 -1
- package/2x/es/components/image/test/image.test.d.ts +1 -0
- package/2x/es/components/image/test/image.test.js +24 -0
- package/2x/es/components/image-viewer/image-viewer.css +3 -0
- package/2x/es/components/index-bar/index-bar.css +2 -0
- package/2x/es/components/input/input.css +6 -0
- package/2x/es/components/jumbo-tabs/jumbo-tabs.css +2 -0
- package/2x/es/components/modal/modal.css +1 -0
- package/2x/es/components/number-keyboard/number-keyboard.css +3 -2
- package/2x/es/components/passcode-input/passcode-input.css +1 -1
- package/2x/es/components/picker/index.d.ts +4 -0
- package/2x/es/components/picker/picker.css +6 -0
- package/2x/es/components/picker/picker.d.ts +4 -0
- package/2x/es/components/picker/picker.js +7 -3
- package/2x/es/components/picker-view/picker-view.css +17 -3
- package/2x/es/components/picker-view/picker-view.d.ts +2 -0
- package/2x/es/components/picker-view/picker-view.js +7 -3
- package/2x/es/components/picker-view/wheel.js +1 -1
- package/2x/es/components/popover/popover.css +2 -0
- package/2x/es/components/result/result.css +1 -1
- package/2x/es/components/side-bar/side-bar.css +1 -0
- package/2x/es/components/slider/slider.css +4 -0
- package/2x/es/components/swipe-action/swipe-action.css +1 -0
- package/2x/es/components/swiper/swiper.css +1 -0
- package/2x/es/components/tab-bar/tab-bar.css +1 -0
- package/2x/es/components/tabs/tabs.css +1 -0
- package/2x/es/components/text-area/text-area.css +6 -0
- package/2x/es/global/global.css +1 -0
- package/2x/es/utils/use-props-value.d.ts +1 -1
- package/2x/es/utils/use-props-value.js +3 -1
- package/2x/es/utils/use-tab-list-scroll.js +1 -1
- package/2x/package.json +1 -1
- package/2x/umd/antd-mobile.js +1 -1
- package/README.md +2 -0
- package/bundle/antd-mobile.cjs.js +3411 -3359
- package/bundle/antd-mobile.es.js +3412 -3360
- package/bundle/style.css +112 -54
- package/cjs/components/button/button.css +2 -1
- package/cjs/components/calendar/calendar.js +2 -2
- package/cjs/components/cascader/cascader.js +1 -1
- package/cjs/components/cascader-view/cascader-view.js +7 -3
- package/cjs/components/date-picker/date-picker.d.ts +2 -2
- package/cjs/components/date-picker/date-picker.js +3 -1
- package/cjs/components/date-picker/index.d.ts +1 -1
- package/cjs/components/date-picker-view/date-picker-view.d.ts +1 -1
- package/cjs/components/date-picker-view/date-picker-view.js +2 -0
- package/cjs/components/dialog/dialog.css +2 -1
- package/cjs/components/dropdown/dropdown.css +2 -2
- package/cjs/components/empty/empty.css +1 -0
- package/cjs/components/floating-bubble/floating-bubble.css +2 -1
- package/cjs/components/floating-panel/floating-panel.css +8 -5
- package/cjs/components/form/form-item.css +2 -1
- package/cjs/components/form/index.css +2 -1
- package/cjs/components/grid/grid.css +2 -1
- package/cjs/components/image/image.d.ts +1 -0
- package/cjs/components/image/image.js +2 -1
- package/cjs/components/image/test/image.test.d.ts +1 -0
- package/cjs/components/image/test/image.test.js +34 -0
- package/cjs/components/image-viewer/image-viewer.css +4 -1
- package/cjs/components/index-bar/index-bar.css +3 -1
- package/cjs/components/input/input.css +6 -1
- package/cjs/components/jumbo-tabs/jumbo-tabs.css +2 -0
- package/cjs/components/modal/modal.css +2 -1
- package/cjs/components/number-keyboard/number-keyboard.css +4 -3
- package/cjs/components/passcode-input/passcode-input.css +1 -1
- package/cjs/components/picker/index.d.ts +4 -0
- package/cjs/components/picker/picker.css +5 -0
- package/cjs/components/picker/picker.d.ts +4 -0
- package/cjs/components/picker/picker.js +7 -3
- package/cjs/components/picker-view/picker-view.css +17 -4
- package/cjs/components/picker-view/picker-view.d.ts +2 -0
- package/cjs/components/picker-view/picker-view.js +10 -3
- package/cjs/components/picker-view/wheel.js +1 -1
- package/cjs/components/popover/popover.css +3 -1
- package/cjs/components/result/result.css +1 -1
- package/cjs/components/side-bar/side-bar.css +2 -1
- package/cjs/components/slider/slider.css +7 -3
- package/cjs/components/swipe-action/swipe-action.css +1 -0
- package/cjs/components/swiper/swiper.css +1 -0
- package/cjs/components/tab-bar/tab-bar.css +1 -0
- package/cjs/components/tabs/tabs.css +1 -0
- package/cjs/components/text-area/text-area.css +6 -1
- package/cjs/global/global.css +2 -1
- package/cjs/utils/use-props-value.d.ts +1 -1
- package/cjs/utils/use-props-value.js +3 -1
- package/cjs/utils/use-tab-list-scroll.js +1 -1
- package/es/components/button/button.css +2 -1
- package/es/components/calendar/calendar.js +2 -2
- package/es/components/cascader/cascader.js +1 -1
- package/es/components/cascader-view/cascader-view.js +6 -3
- package/es/components/date-picker/date-picker.d.ts +2 -2
- package/es/components/date-picker/date-picker.js +3 -1
- package/es/components/date-picker/index.d.ts +1 -1
- package/es/components/date-picker-view/date-picker-view.d.ts +1 -1
- package/es/components/date-picker-view/date-picker-view.js +2 -0
- package/es/components/dialog/dialog.css +2 -1
- package/es/components/dropdown/dropdown.css +2 -2
- package/es/components/empty/empty.css +1 -0
- package/es/components/floating-bubble/floating-bubble.css +2 -1
- package/es/components/floating-panel/floating-panel.css +8 -5
- package/es/components/form/form-item.css +2 -1
- package/es/components/form/index.css +2 -1
- package/es/components/grid/grid.css +2 -1
- package/es/components/image/image.d.ts +1 -0
- package/es/components/image/image.js +2 -1
- package/es/components/image/test/image.test.d.ts +1 -0
- package/es/components/image/test/image.test.js +24 -0
- package/es/components/image-viewer/image-viewer.css +4 -1
- package/es/components/index-bar/index-bar.css +3 -1
- package/es/components/input/input.css +6 -1
- package/es/components/jumbo-tabs/jumbo-tabs.css +2 -0
- package/es/components/modal/modal.css +2 -1
- package/es/components/number-keyboard/number-keyboard.css +4 -3
- package/es/components/passcode-input/passcode-input.css +1 -1
- package/es/components/picker/index.d.ts +4 -0
- package/es/components/picker/picker.css +5 -0
- package/es/components/picker/picker.d.ts +4 -0
- package/es/components/picker/picker.js +7 -3
- package/es/components/picker-view/picker-view.css +17 -4
- package/es/components/picker-view/picker-view.d.ts +2 -0
- package/es/components/picker-view/picker-view.js +7 -3
- package/es/components/picker-view/wheel.js +1 -1
- package/es/components/popover/popover.css +3 -1
- package/es/components/result/result.css +1 -1
- package/es/components/side-bar/side-bar.css +2 -1
- package/es/components/slider/slider.css +7 -3
- package/es/components/swipe-action/swipe-action.css +1 -0
- package/es/components/swiper/swiper.css +1 -0
- package/es/components/tab-bar/tab-bar.css +1 -0
- package/es/components/tabs/tabs.css +1 -0
- package/es/components/text-area/text-area.css +6 -1
- package/es/global/global.css +2 -1
- package/es/utils/use-props-value.d.ts +1 -1
- package/es/utils/use-props-value.js +3 -1
- package/es/utils/use-tab-list-scroll.js +1 -1
- package/package.json +1 -1
- package/umd/antd-mobile.js +1 -1
|
@@ -2,7 +2,7 @@ import { FC, ReactNode } from 'react';
|
|
|
2
2
|
import type { PickerViewProps } from '../picker-view';
|
|
3
3
|
import { NativeProps } from '../../utils/native-props';
|
|
4
4
|
import type { Precision, DatePickerFilter } from '../date-picker/date-picker-utils';
|
|
5
|
-
export declare type DatePickerViewProps = Pick<PickerViewProps, 'style' | 'mouseWheel'> & {
|
|
5
|
+
export declare type DatePickerViewProps = Pick<PickerViewProps, 'style' | 'mouseWheel' | 'loading' | 'loadingContent'> & {
|
|
6
6
|
value?: Date;
|
|
7
7
|
defaultValue?: Date;
|
|
8
8
|
onChange?: (value: Date) => void;
|
|
@@ -32,6 +32,8 @@ export const DatePickerView = p => {
|
|
|
32
32
|
}, [props.onChange, props.precision]);
|
|
33
33
|
return withNativeProps(props, React.createElement(PickerView, {
|
|
34
34
|
columns: selected => generateDatePickerColumns(selected, props.min, props.max, props.precision, props.renderLabel, props.filter),
|
|
35
|
+
loading: props.loading,
|
|
36
|
+
loadingContent: props.loadingContent,
|
|
35
37
|
value: pickerValue,
|
|
36
38
|
mouseWheel: props.mouseWheel,
|
|
37
39
|
onChange: onChange
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.adm-dropdown {
|
|
2
|
-
background-color:
|
|
2
|
+
background-color: var(--adm-color-background);
|
|
3
3
|
}
|
|
4
4
|
|
|
5
5
|
.adm-dropdown .adm-dropdown-nav {
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
|
|
62
62
|
.adm-dropdown-item-content {
|
|
63
63
|
width: 100%;
|
|
64
|
-
background:
|
|
64
|
+
background: var(--adm-color-background);
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
.adm-dropdown-item-content-hidden {
|
|
@@ -2,9 +2,6 @@
|
|
|
2
2
|
--border-radius: 16px;
|
|
3
3
|
--header-height: 56px;
|
|
4
4
|
--z-index: var(--adm-floating-panel-z-index, 900);
|
|
5
|
-
border-top-left-radius: var(--border-radius);
|
|
6
|
-
border-top-right-radius: var(--border-radius);
|
|
7
|
-
background: var(--adm-color-white);
|
|
8
5
|
position: fixed;
|
|
9
6
|
z-index: var(--z-index);
|
|
10
7
|
bottom: 0;
|
|
@@ -32,7 +29,7 @@
|
|
|
32
29
|
bottom: -100vh;
|
|
33
30
|
height: 100vh;
|
|
34
31
|
width: 100vw;
|
|
35
|
-
background: var(--adm-color-
|
|
32
|
+
background: var(--adm-color-background);
|
|
36
33
|
}
|
|
37
34
|
|
|
38
35
|
.adm-floating-panel .adm-floating-panel-header {
|
|
@@ -41,8 +38,13 @@
|
|
|
41
38
|
display: flex;
|
|
42
39
|
justify-content: center;
|
|
43
40
|
align-items: center;
|
|
41
|
+
cursor: -webkit-grab;
|
|
44
42
|
cursor: grab;
|
|
43
|
+
-webkit-user-select: none;
|
|
45
44
|
user-select: none;
|
|
45
|
+
background-color: var(--adm-color-background);
|
|
46
|
+
border-top-left-radius: var(--border-radius);
|
|
47
|
+
border-top-right-radius: var(--border-radius);
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
.adm-floating-panel .adm-floating-panel-header .adm-floating-panel-bar {
|
|
@@ -55,4 +57,5 @@
|
|
|
55
57
|
.adm-floating-panel .adm-floating-panel-content {
|
|
56
58
|
flex: 1;
|
|
57
59
|
overflow-y: scroll;
|
|
60
|
+
background: var(--adm-color-background);
|
|
58
61
|
}
|
|
@@ -13,5 +13,6 @@ export declare type ImageProps = {
|
|
|
13
13
|
onClick?: (event: React.MouseEvent<HTMLImageElement, Event>) => void;
|
|
14
14
|
onError?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
|
|
15
15
|
onLoad?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
|
|
16
|
+
onContainerClick?: (event: React.MouseEvent<HTMLDivElement, Event>) => void;
|
|
16
17
|
} & NativeProps<'--width' | '--height'> & Pick<React.ImgHTMLAttributes<HTMLImageElement>, 'crossOrigin' | 'decoding' | 'loading' | 'referrerPolicy' | 'sizes' | 'srcSet' | 'useMap'>;
|
|
17
18
|
export declare const Image: React.FC<ImageProps>;
|
|
@@ -87,7 +87,8 @@ export const Image = staged(p => {
|
|
|
87
87
|
return withNativeProps(props, React.createElement("div", {
|
|
88
88
|
ref: ref,
|
|
89
89
|
className: classPrefix,
|
|
90
|
-
style: style
|
|
90
|
+
style: style,
|
|
91
|
+
onClick: props.onContainerClick
|
|
91
92
|
}, props.lazy && !initialized && React.createElement(LazyDetector, {
|
|
92
93
|
onActive: () => {
|
|
93
94
|
setInitialized(true);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
2
|
+
import React from 'react';
|
|
3
|
+
import { fireEvent, render, testA11y } from 'testing';
|
|
4
|
+
import Image from '../index';
|
|
5
|
+
const demoSrc = 'https://images.unsplash.com/photo-1567945716310-4745a6b7844b?ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&ixlib=rb-1.2.1&auto=format&fit=crop&w=300&q=60';
|
|
6
|
+
describe('image', () => {
|
|
7
|
+
test('a11y', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
8
|
+
yield testA11y(React.createElement(Image, {
|
|
9
|
+
src: demoSrc
|
|
10
|
+
}));
|
|
11
|
+
}));
|
|
12
|
+
test('onContainerClick can work', () => {
|
|
13
|
+
const onContainerClick = jest.fn();
|
|
14
|
+
const {
|
|
15
|
+
getByTestId
|
|
16
|
+
} = render(React.createElement(Image, {
|
|
17
|
+
src: demoSrc,
|
|
18
|
+
onContainerClick: onContainerClick,
|
|
19
|
+
"data-testid": 'img'
|
|
20
|
+
}));
|
|
21
|
+
fireEvent.click(getByTestId('img'));
|
|
22
|
+
expect(onContainerClick).toBeCalledTimes(1);
|
|
23
|
+
});
|
|
24
|
+
});
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
width: 100vw;
|
|
3
3
|
height: 100vh;
|
|
4
4
|
touch-action: none;
|
|
5
|
+
-webkit-user-select: none;
|
|
5
6
|
user-select: none;
|
|
6
7
|
}
|
|
7
8
|
|
|
@@ -16,6 +17,7 @@
|
|
|
16
17
|
height: 100%;
|
|
17
18
|
position: relative;
|
|
18
19
|
z-index: 1;
|
|
20
|
+
cursor: -webkit-grab;
|
|
19
21
|
cursor: grab;
|
|
20
22
|
touch-action: none;
|
|
21
23
|
}
|
|
@@ -43,6 +45,7 @@
|
|
|
43
45
|
top: 0;
|
|
44
46
|
width: 100%;
|
|
45
47
|
height: 100%;
|
|
48
|
+
cursor: -webkit-grab;
|
|
46
49
|
cursor: grab;
|
|
47
50
|
touch-action: none;
|
|
48
51
|
}
|
|
@@ -37,6 +37,7 @@
|
|
|
37
37
|
overflow: visible;
|
|
38
38
|
color: var(--adm-color-weak);
|
|
39
39
|
font-size: var(--adm-font-size-4);
|
|
40
|
+
-webkit-user-select: none;
|
|
40
41
|
user-select: none;
|
|
41
42
|
touch-action: none;
|
|
42
43
|
}
|
|
@@ -88,6 +89,7 @@
|
|
|
88
89
|
}
|
|
89
90
|
|
|
90
91
|
.adm-index-bar-sticky .adm-index-bar-anchor-title {
|
|
92
|
+
position: -webkit-sticky;
|
|
91
93
|
position: sticky;
|
|
92
94
|
z-index: 900;
|
|
93
95
|
top: var(--sticky-offset-top);
|
|
@@ -34,11 +34,17 @@
|
|
|
34
34
|
background: transparent;
|
|
35
35
|
border: 0;
|
|
36
36
|
outline: none;
|
|
37
|
+
-webkit-appearance: none;
|
|
37
38
|
appearance: none;
|
|
38
39
|
min-height: 1.5em;
|
|
39
40
|
text-align: var(--text-align);
|
|
40
41
|
}
|
|
41
42
|
|
|
43
|
+
.adm-input-element::-webkit-input-placeholder {
|
|
44
|
+
color: var(--placeholder-color);
|
|
45
|
+
font-family: inherit;
|
|
46
|
+
}
|
|
47
|
+
|
|
42
48
|
.adm-input-element::placeholder {
|
|
43
49
|
color: var(--placeholder-color);
|
|
44
50
|
font-family: inherit;
|
|
@@ -35,6 +35,7 @@
|
|
|
35
35
|
flex-direction: column;
|
|
36
36
|
align-items: center;
|
|
37
37
|
position: relative;
|
|
38
|
+
width: -webkit-min-content;
|
|
38
39
|
width: min-content;
|
|
39
40
|
margin: 0 auto;
|
|
40
41
|
padding: 24px 0;
|
|
@@ -49,6 +50,7 @@
|
|
|
49
50
|
}
|
|
50
51
|
|
|
51
52
|
.adm-jumbo-tabs-tab-description {
|
|
53
|
+
width: -webkit-min-content;
|
|
52
54
|
width: min-content;
|
|
53
55
|
padding: 0 16px;
|
|
54
56
|
border-radius: 20px;
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
.adm-number-keyboard-popup.adm-popup {
|
|
12
12
|
width: 100%;
|
|
13
|
+
-webkit-user-select: none;
|
|
13
14
|
user-select: none;
|
|
14
15
|
z-index: 1050;
|
|
15
16
|
}
|
|
@@ -31,7 +32,7 @@
|
|
|
31
32
|
align-items: center;
|
|
32
33
|
padding: 0 24px;
|
|
33
34
|
color: var(--adm-color-weak);
|
|
34
|
-
background-color: var(--adm-color-
|
|
35
|
+
background-color: var(--adm-color-background);
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
.adm-number-keyboard-header-close-button {
|
|
@@ -111,7 +112,7 @@
|
|
|
111
112
|
|
|
112
113
|
.adm-number-keyboard-key.extra-key,
|
|
113
114
|
.adm-number-keyboard-key.number-key {
|
|
114
|
-
background-color: var(--adm-color-
|
|
115
|
+
background-color: var(--adm-color-background);
|
|
115
116
|
}
|
|
116
117
|
|
|
117
118
|
.adm-number-keyboard-key.extra-key:active::before,
|
|
@@ -6,6 +6,8 @@ declare const _default: import("react").NamedExoticComponent<{
|
|
|
6
6
|
columns: import("../picker-view").PickerColumn[] | ((value: import("../picker-view").PickerValue[]) => import("../picker-view").PickerColumn[]);
|
|
7
7
|
value?: import("../picker-view").PickerValue[] | undefined;
|
|
8
8
|
defaultValue?: import("../picker-view").PickerValue[] | undefined;
|
|
9
|
+
loading?: boolean | undefined;
|
|
10
|
+
loadingContent?: import("react").ReactNode;
|
|
9
11
|
onSelect?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
|
|
10
12
|
onConfirm?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
|
|
11
13
|
onCancel?: (() => void) | undefined;
|
|
@@ -29,6 +31,8 @@ declare const _default: import("react").NamedExoticComponent<{
|
|
|
29
31
|
columns: import("../picker-view").PickerColumn[] | ((value: import("../picker-view").PickerValue[]) => import("../picker-view").PickerColumn[]);
|
|
30
32
|
value?: import("../picker-view").PickerValue[] | undefined;
|
|
31
33
|
defaultValue?: import("../picker-view").PickerValue[] | undefined;
|
|
34
|
+
loading?: boolean | undefined;
|
|
35
|
+
loadingContent?: import("react").ReactNode;
|
|
32
36
|
onSelect?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
|
|
33
37
|
onConfirm?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
|
|
34
38
|
onCancel?: (() => void) | undefined;
|
|
@@ -33,6 +33,12 @@
|
|
|
33
33
|
padding: 16px 16px;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
+
.adm-picker-header-button-disabled,
|
|
37
|
+
.adm-picker-header-button-disabled:active {
|
|
38
|
+
opacity: 0.4;
|
|
39
|
+
cursor: not-allowed;
|
|
40
|
+
}
|
|
41
|
+
|
|
36
42
|
.adm-picker-header-title {
|
|
37
43
|
padding: 8px 8px;
|
|
38
44
|
font-size: var(--title-font-size);
|
|
@@ -12,6 +12,8 @@ export declare type PickerProps = {
|
|
|
12
12
|
columns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]);
|
|
13
13
|
value?: PickerValue[];
|
|
14
14
|
defaultValue?: PickerValue[];
|
|
15
|
+
loading?: boolean;
|
|
16
|
+
loadingContent?: ReactNode;
|
|
15
17
|
onSelect?: (value: PickerValue[], extend: PickerValueExtend) => void;
|
|
16
18
|
onConfirm?: (value: PickerValue[], extend: PickerValueExtend) => void;
|
|
17
19
|
onCancel?: () => void;
|
|
@@ -31,6 +33,8 @@ export declare const Picker: React.MemoExoticComponent<React.ForwardRefExoticCom
|
|
|
31
33
|
columns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]);
|
|
32
34
|
value?: PickerValue[] | undefined;
|
|
33
35
|
defaultValue?: PickerValue[] | undefined;
|
|
36
|
+
loading?: boolean | undefined;
|
|
37
|
+
loadingContent?: ReactNode;
|
|
34
38
|
onSelect?: ((value: PickerValue[], extend: PickerValueExtend) => void) | undefined;
|
|
35
39
|
onConfirm?: ((value: PickerValue[], extend: PickerValueExtend) => void) | undefined;
|
|
36
40
|
onCancel?: (() => void) | undefined;
|
|
@@ -97,14 +97,18 @@ export const Picker = memo(forwardRef((p, ref) => {
|
|
|
97
97
|
className: `${classPrefix}-header-title`
|
|
98
98
|
}, props.title), React.createElement("a", {
|
|
99
99
|
role: 'button',
|
|
100
|
-
className: `${classPrefix}-header-button`,
|
|
100
|
+
className: classNames(`${classPrefix}-header-button`, props.loading && `${classPrefix}-header-button-disabled`),
|
|
101
101
|
onClick: () => {
|
|
102
|
-
|
|
102
|
+
if (props.loading) return;
|
|
103
|
+
setValue(innerValue, true);
|
|
103
104
|
setVisible(false);
|
|
104
|
-
}
|
|
105
|
+
},
|
|
106
|
+
"aria-disabled": props.loading
|
|
105
107
|
}, props.confirmText)), React.createElement("div", {
|
|
106
108
|
className: `${classPrefix}-body`
|
|
107
109
|
}, React.createElement(PickerView, {
|
|
110
|
+
loading: props.loading,
|
|
111
|
+
loadingContent: props.loadingContent,
|
|
108
112
|
columns: props.columns,
|
|
109
113
|
renderLabel: props.renderLabel,
|
|
110
114
|
value: innerValue,
|
|
@@ -7,12 +7,13 @@
|
|
|
7
7
|
display: flex;
|
|
8
8
|
position: relative;
|
|
9
9
|
overflow: hidden;
|
|
10
|
-
background: var(--adm-color-
|
|
10
|
+
background: var(--adm-color-background);
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
.adm-picker-view-column {
|
|
14
14
|
height: 100%;
|
|
15
15
|
flex: 1;
|
|
16
|
+
-webkit-user-select: none;
|
|
16
17
|
user-select: none;
|
|
17
18
|
touch-action: none;
|
|
18
19
|
position: relative;
|
|
@@ -21,6 +22,7 @@
|
|
|
21
22
|
|
|
22
23
|
.adm-picker-view-column-wheel {
|
|
23
24
|
width: 100%;
|
|
25
|
+
cursor: -webkit-grab;
|
|
24
26
|
cursor: grab;
|
|
25
27
|
position: absolute;
|
|
26
28
|
top: calc(50% - var(--item-height) / 2);
|
|
@@ -114,9 +116,21 @@
|
|
|
114
116
|
}
|
|
115
117
|
|
|
116
118
|
.adm-picker-view-mask-top {
|
|
117
|
-
background:
|
|
119
|
+
background: var(--adm-color-background);
|
|
120
|
+
-webkit-mask: linear-gradient(0deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
|
|
121
|
+
mask: linear-gradient(0deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
|
|
118
122
|
}
|
|
119
123
|
|
|
120
124
|
.adm-picker-view-mask-bottom {
|
|
121
|
-
background:
|
|
125
|
+
background: var(--adm-color-background);
|
|
126
|
+
-webkit-mask: linear-gradient(180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
|
|
127
|
+
mask: linear-gradient(180deg, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.8) 50%, #000000 100%);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
.adm-picker-view-loading-content {
|
|
131
|
+
width: 100%;
|
|
132
|
+
height: 100%;
|
|
133
|
+
display: flex;
|
|
134
|
+
justify-content: center;
|
|
135
|
+
align-items: center;
|
|
122
136
|
}
|
|
@@ -17,6 +17,8 @@ export declare type PickerViewProps = {
|
|
|
17
17
|
value?: PickerValue[];
|
|
18
18
|
defaultValue?: PickerValue[];
|
|
19
19
|
mouseWheel?: boolean;
|
|
20
|
+
loading?: boolean;
|
|
21
|
+
loadingContent?: ReactNode;
|
|
20
22
|
onChange?: (value: PickerValue[], extend: PickerValueExtend) => void;
|
|
21
23
|
} & Pick<PickerProps, 'renderLabel'> & NativeProps<'--height' | '--item-height' | '--item-font-size'>;
|
|
22
24
|
export declare const PickerView: React.NamedExoticComponent<PickerViewProps>;
|
|
@@ -5,11 +5,15 @@ import { useColumnsExtend } from './columns-extend';
|
|
|
5
5
|
import { withNativeProps } from '../../utils/native-props';
|
|
6
6
|
import { useDebounceEffect } from 'ahooks';
|
|
7
7
|
import { defaultRenderLabel } from '../picker/picker-utils';
|
|
8
|
+
import SpinLoading from '../spin-loading';
|
|
8
9
|
const classPrefix = `adm-picker-view`;
|
|
9
10
|
const defaultProps = {
|
|
10
11
|
defaultValue: [],
|
|
11
12
|
renderLabel: defaultRenderLabel,
|
|
12
|
-
mouseWheel: false
|
|
13
|
+
mouseWheel: false,
|
|
14
|
+
loadingContent: React.createElement("div", {
|
|
15
|
+
className: `${classPrefix}-loading-content`
|
|
16
|
+
}, React.createElement(SpinLoading, null))
|
|
13
17
|
};
|
|
14
18
|
export const PickerView = memo(p => {
|
|
15
19
|
const props = mergeProps(defaultProps, p);
|
|
@@ -53,7 +57,7 @@ export const PickerView = memo(p => {
|
|
|
53
57
|
}, []);
|
|
54
58
|
return withNativeProps(props, React.createElement("div", {
|
|
55
59
|
className: `${classPrefix}`
|
|
56
|
-
}, columns.map((column, index) => React.createElement(Wheel, {
|
|
60
|
+
}, props.loading ? props.loadingContent : React.createElement(React.Fragment, null, columns.map((column, index) => React.createElement(Wheel, {
|
|
57
61
|
key: index,
|
|
58
62
|
index: index,
|
|
59
63
|
column: column,
|
|
@@ -69,6 +73,6 @@ export const PickerView = memo(p => {
|
|
|
69
73
|
className: `${classPrefix}-mask-middle`
|
|
70
74
|
}), React.createElement("div", {
|
|
71
75
|
className: `${classPrefix}-mask-bottom`
|
|
72
|
-
}))));
|
|
76
|
+
})))));
|
|
73
77
|
});
|
|
74
78
|
PickerView.displayName = 'PickerView';
|
|
@@ -40,7 +40,7 @@ export const Wheel = memo(props => {
|
|
|
40
40
|
});
|
|
41
41
|
useIsomorphicLayoutEffect(() => {
|
|
42
42
|
if (draggingRef.current) return;
|
|
43
|
-
if (
|
|
43
|
+
if (value === null) return;
|
|
44
44
|
const targetIndex = column.findIndex(item => item.value === value);
|
|
45
45
|
if (targetIndex < 0) return;
|
|
46
46
|
const finalPosition = targetIndex * -itemHeight.current;
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
white-space: normal;
|
|
12
12
|
text-align: left;
|
|
13
13
|
cursor: auto;
|
|
14
|
+
-webkit-user-select: text;
|
|
14
15
|
user-select: text;
|
|
15
16
|
animation: none;
|
|
16
17
|
}
|
|
@@ -41,6 +42,7 @@
|
|
|
41
42
|
border-radius: 16px;
|
|
42
43
|
box-shadow: 0 0 60px 0 rgba(51, 51, 51, 0.2);
|
|
43
44
|
font-size: var(--adm-font-size-7);
|
|
45
|
+
width: -webkit-max-content;
|
|
44
46
|
width: max-content;
|
|
45
47
|
min-width: 64px;
|
|
46
48
|
max-width: calc(100vw - 48px);
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
--fill-color: var(--adm-color-primary);
|
|
3
3
|
padding: 10px 28px;
|
|
4
4
|
list-style: none;
|
|
5
|
+
-webkit-user-select: none;
|
|
5
6
|
user-select: none;
|
|
6
7
|
}
|
|
7
8
|
|
|
@@ -66,10 +67,12 @@
|
|
|
66
67
|
width: 24px;
|
|
67
68
|
height: 24px;
|
|
68
69
|
margin: 16px;
|
|
70
|
+
-webkit-user-select: none;
|
|
69
71
|
user-select: none;
|
|
70
72
|
}
|
|
71
73
|
|
|
72
74
|
.adm-slider-thumb-container {
|
|
75
|
+
cursor: -webkit-grab;
|
|
73
76
|
cursor: grab;
|
|
74
77
|
touch-action: none;
|
|
75
78
|
position: absolute;
|
|
@@ -97,6 +100,7 @@
|
|
|
97
100
|
color: var(--adm-color-text);
|
|
98
101
|
text-align: center;
|
|
99
102
|
word-break: keep-all;
|
|
103
|
+
-webkit-user-select: none;
|
|
100
104
|
user-select: none;
|
|
101
105
|
transform: translateX(-50%);
|
|
102
106
|
}
|
|
@@ -27,11 +27,17 @@
|
|
|
27
27
|
background: transparent;
|
|
28
28
|
border: 0;
|
|
29
29
|
outline: none;
|
|
30
|
+
-webkit-appearance: none;
|
|
30
31
|
appearance: none;
|
|
31
32
|
min-height: 1.5em;
|
|
32
33
|
text-align: var(--text-align);
|
|
33
34
|
}
|
|
34
35
|
|
|
36
|
+
.adm-text-area-element::-webkit-input-placeholder {
|
|
37
|
+
color: var(--placeholder-color);
|
|
38
|
+
font-family: inherit;
|
|
39
|
+
}
|
|
40
|
+
|
|
35
41
|
.adm-text-area-element::placeholder {
|
|
36
42
|
color: var(--placeholder-color);
|
|
37
43
|
font-family: inherit;
|
package/2x/es/global/global.css
CHANGED
|
@@ -4,5 +4,5 @@ declare type Options<T> = {
|
|
|
4
4
|
defaultValue: T;
|
|
5
5
|
onChange?: (v: T) => void;
|
|
6
6
|
};
|
|
7
|
-
export declare function usePropsValue<T>(options: Options<T>): readonly [T, (v: SetStateAction<T
|
|
7
|
+
export declare function usePropsValue<T>(options: Options<T>): readonly [T, (v: SetStateAction<T>, forceTrigger?: boolean) => void];
|
|
8
8
|
export {};
|
|
@@ -13,8 +13,10 @@ export function usePropsValue(options) {
|
|
|
13
13
|
stateRef.current = value;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
const setState = useMemoizedFn(v => {
|
|
16
|
+
const setState = useMemoizedFn((v, forceTrigger = false) => {
|
|
17
|
+
// `forceTrigger` means trigger `onChange` even if `v` is the same as `stateRef.current`
|
|
17
18
|
const nextValue = typeof v === 'function' ? v(stateRef.current) : v;
|
|
19
|
+
if (!forceTrigger && nextValue === stateRef.current) return;
|
|
18
20
|
stateRef.current = nextValue;
|
|
19
21
|
update();
|
|
20
22
|
onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
|