@kdcloudjs/kdesign 1.6.7 → 1.6.8
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/CHANGELOG.md +27 -0
- package/dist/kdesign.css +1 -1
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +16 -14
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +1 -1
- package/dist/kdesign.min.js +2 -2
- package/dist/kdesign.min.js.map +1 -1
- package/es/slider/slider.js +15 -13
- package/lib/slider/slider.js +14 -12
- package/package.json +1 -1
package/es/slider/slider.js
CHANGED
|
@@ -16,7 +16,7 @@ var __rest = this && this.__rest || function (s, e) {
|
|
|
16
16
|
return t;
|
|
17
17
|
};
|
|
18
18
|
|
|
19
|
-
import React, { useContext, useEffect, useRef
|
|
19
|
+
import React, { useContext, useEffect, useRef } from 'react';
|
|
20
20
|
import classNames from 'classnames';
|
|
21
21
|
import ConfigContext from '../config-provider/ConfigContext';
|
|
22
22
|
import { getCompProps } from '../_utils';
|
|
@@ -75,11 +75,11 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
75
75
|
value = _useMergedState2[0],
|
|
76
76
|
setValue = _useMergedState2[1];
|
|
77
77
|
|
|
78
|
-
var
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
78
|
+
var isDragging = useRef(false);
|
|
79
|
+
var valueRef = useRef(useMergedState(0, {
|
|
80
|
+
defaultValue: defaultValue,
|
|
81
|
+
value: propsValue
|
|
82
|
+
}));
|
|
83
83
|
var mouseOffset;
|
|
84
84
|
|
|
85
85
|
var addDocumentMouseEvents = function addDocumentMouseEvents() {
|
|
@@ -151,11 +151,11 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
151
151
|
var onEnd = function onEnd() {
|
|
152
152
|
removeDocumentEvents();
|
|
153
153
|
|
|
154
|
-
if (
|
|
155
|
-
onAfterChange && onAfterChange(
|
|
154
|
+
if (isDragging.current) {
|
|
155
|
+
onAfterChange && onAfterChange(valueRef.current);
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
-
|
|
158
|
+
isDragging.current = false;
|
|
159
159
|
};
|
|
160
160
|
|
|
161
161
|
var handleTouchStart = function handleTouchStart() {// console.log('object :>> ', 'object', addDocumentMouseEvents)
|
|
@@ -178,11 +178,12 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
178
178
|
} // 设置状态值
|
|
179
179
|
|
|
180
180
|
|
|
181
|
-
|
|
181
|
+
isDragging.current = true;
|
|
182
182
|
var newV = calcValueByPos(position);
|
|
183
183
|
|
|
184
184
|
if (newV !== value) {
|
|
185
185
|
setValue(newV);
|
|
186
|
+
valueRef.current = newV;
|
|
186
187
|
}
|
|
187
188
|
|
|
188
189
|
onChange && onChange(newV); // 监听document的鼠标事件
|
|
@@ -209,11 +210,11 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
209
210
|
if (!sliderRef.current) {
|
|
210
211
|
removeDocumentEvents();
|
|
211
212
|
|
|
212
|
-
if (
|
|
213
|
+
if (isDragging.current) {
|
|
213
214
|
onAfterChange(value);
|
|
214
215
|
}
|
|
215
216
|
|
|
216
|
-
|
|
217
|
+
isDragging.current = false;
|
|
217
218
|
return;
|
|
218
219
|
}
|
|
219
220
|
|
|
@@ -222,6 +223,7 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
222
223
|
|
|
223
224
|
if (newV !== value) {
|
|
224
225
|
setValue(newV);
|
|
226
|
+
valueRef.current = newV;
|
|
225
227
|
}
|
|
226
228
|
|
|
227
229
|
onChange && onChange(newV);
|
|
@@ -239,7 +241,7 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
239
241
|
style: style,
|
|
240
242
|
onTouchStart: disabled ? noop : handleTouchStart,
|
|
241
243
|
onMouseDown: disabled ? noop : handleMouseDown,
|
|
242
|
-
onMouseUp
|
|
244
|
+
// onMouseUp={disabled ? noop : handleMouseUp}
|
|
243
245
|
onKeyDown: disabled ? noop : handleKeyDown,
|
|
244
246
|
onFocus: disabled ? noop : handleFocus,
|
|
245
247
|
onBlur: disabled ? noop : handleBlur
|
package/lib/slider/slider.js
CHANGED
|
@@ -108,11 +108,11 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
108
108
|
value = _useMergedState2[0],
|
|
109
109
|
setValue = _useMergedState2[1];
|
|
110
110
|
|
|
111
|
-
var
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
111
|
+
var isDragging = (0, _react.useRef)(false);
|
|
112
|
+
var valueRef = (0, _react.useRef)((0, _hooks.useMergedState)(0, {
|
|
113
|
+
defaultValue: defaultValue,
|
|
114
|
+
value: propsValue
|
|
115
|
+
}));
|
|
116
116
|
var mouseOffset;
|
|
117
117
|
|
|
118
118
|
var addDocumentMouseEvents = function addDocumentMouseEvents() {
|
|
@@ -183,11 +183,11 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
183
183
|
var onEnd = function onEnd() {
|
|
184
184
|
removeDocumentEvents();
|
|
185
185
|
|
|
186
|
-
if (
|
|
187
|
-
onAfterChange && onAfterChange(
|
|
186
|
+
if (isDragging.current) {
|
|
187
|
+
onAfterChange && onAfterChange(valueRef.current);
|
|
188
188
|
}
|
|
189
189
|
|
|
190
|
-
|
|
190
|
+
isDragging.current = false;
|
|
191
191
|
};
|
|
192
192
|
|
|
193
193
|
var handleTouchStart = function handleTouchStart() {// console.log('object :>> ', 'object', addDocumentMouseEvents)
|
|
@@ -210,11 +210,12 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
210
210
|
} // 设置状态值
|
|
211
211
|
|
|
212
212
|
|
|
213
|
-
|
|
213
|
+
isDragging.current = true;
|
|
214
214
|
var newV = calcValueByPos(position);
|
|
215
215
|
|
|
216
216
|
if (newV !== value) {
|
|
217
217
|
setValue(newV);
|
|
218
|
+
valueRef.current = newV;
|
|
218
219
|
}
|
|
219
220
|
|
|
220
221
|
onChange && onChange(newV); // 监听document的鼠标事件
|
|
@@ -241,11 +242,11 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
241
242
|
if (!sliderRef.current) {
|
|
242
243
|
removeDocumentEvents();
|
|
243
244
|
|
|
244
|
-
if (
|
|
245
|
+
if (isDragging.current) {
|
|
245
246
|
onAfterChange(value);
|
|
246
247
|
}
|
|
247
248
|
|
|
248
|
-
|
|
249
|
+
isDragging.current = false;
|
|
249
250
|
return;
|
|
250
251
|
}
|
|
251
252
|
|
|
@@ -254,6 +255,7 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
254
255
|
|
|
255
256
|
if (newV !== value) {
|
|
256
257
|
setValue(newV);
|
|
258
|
+
valueRef.current = newV;
|
|
257
259
|
}
|
|
258
260
|
|
|
259
261
|
onChange && onChange(newV);
|
|
@@ -271,7 +273,7 @@ var InteranalSlider = function InteranalSlider(props, ref) {
|
|
|
271
273
|
style: style,
|
|
272
274
|
onTouchStart: disabled ? noop : handleTouchStart,
|
|
273
275
|
onMouseDown: disabled ? noop : handleMouseDown,
|
|
274
|
-
onMouseUp
|
|
276
|
+
// onMouseUp={disabled ? noop : handleMouseUp}
|
|
275
277
|
onKeyDown: disabled ? noop : handleKeyDown,
|
|
276
278
|
onFocus: disabled ? noop : handleFocus,
|
|
277
279
|
onBlur: disabled ? noop : handleBlur
|