@micromag/core 0.3.203 → 0.3.204
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/es/hooks.js +17 -24
- package/lib/hooks.js +17 -24
- package/package.json +2 -2
package/es/hooks.js
CHANGED
|
@@ -216,25 +216,16 @@ function useSpringValue(wantedProgress, immediate, params) {
|
|
|
216
216
|
var onChange = useCallback(function (spring) {
|
|
217
217
|
return setProgress(getValueFromSpring(spring));
|
|
218
218
|
}, [setProgress]);
|
|
219
|
+
useSpring(_objectSpread({
|
|
220
|
+
progress: wantedProgress,
|
|
221
|
+
onChange: onChange,
|
|
222
|
+
immediate: immediate
|
|
223
|
+
}, params)); // useEffect(() => {
|
|
224
|
+
// if (wantedProgress !== null) {
|
|
225
|
+
// api.start({ progress: wantedProgress, immediate, ...params });
|
|
226
|
+
// }
|
|
227
|
+
// }, [wantedProgress, immediate, params, api]);
|
|
219
228
|
|
|
220
|
-
var _useSpring = useSpring(function () {
|
|
221
|
-
return _objectSpread({
|
|
222
|
-
progress: wantedProgress,
|
|
223
|
-
onChange: onChange,
|
|
224
|
-
immediate: immediate
|
|
225
|
-
}, params);
|
|
226
|
-
}),
|
|
227
|
-
_useSpring2 = _slicedToArray(_useSpring, 2),
|
|
228
|
-
api = _useSpring2[1];
|
|
229
|
-
|
|
230
|
-
useEffect(function () {
|
|
231
|
-
if (wantedProgress !== null) {
|
|
232
|
-
api.start(_objectSpread({
|
|
233
|
-
progress: wantedProgress,
|
|
234
|
-
immediate: immediate
|
|
235
|
-
}, params));
|
|
236
|
-
}
|
|
237
|
-
}, [wantedProgress, immediate, params, api]);
|
|
238
229
|
return immediate ? wantedProgress : progress;
|
|
239
230
|
}
|
|
240
231
|
|
|
@@ -252,7 +243,12 @@ function useDragProgress() {
|
|
|
252
243
|
_ref$onProgress = _ref.onProgress,
|
|
253
244
|
onProgress = _ref$onProgress === void 0 ? null : _ref$onProgress,
|
|
254
245
|
_ref$springParams = _ref.springParams,
|
|
255
|
-
springParams = _ref$springParams === void 0 ? undefined : _ref$springParams
|
|
246
|
+
springParams = _ref$springParams === void 0 ? undefined : _ref$springParams,
|
|
247
|
+
_ref$dragOptions = _ref.dragOptions,
|
|
248
|
+
dragOptions = _ref$dragOptions === void 0 ? {
|
|
249
|
+
filterTaps: true,
|
|
250
|
+
preventDefault: true
|
|
251
|
+
} : _ref$dragOptions;
|
|
256
252
|
|
|
257
253
|
var refDragging = useRef(false);
|
|
258
254
|
|
|
@@ -266,7 +262,7 @@ function useDragProgress() {
|
|
|
266
262
|
progress = _useState2$.progress,
|
|
267
263
|
setDragState = _useState2[1];
|
|
268
264
|
|
|
269
|
-
var
|
|
265
|
+
var onDrag = useCallback(function (gestureState) {
|
|
270
266
|
if (disabled) {
|
|
271
267
|
return;
|
|
272
268
|
}
|
|
@@ -294,10 +290,7 @@ function useDragProgress() {
|
|
|
294
290
|
onProgress(newProgress, gestureState);
|
|
295
291
|
}
|
|
296
292
|
}, [setDragState, disabled, onTap, computeProgress, setDragState, onProgress]);
|
|
297
|
-
var bind = useDrag(
|
|
298
|
-
filterTaps: true,
|
|
299
|
-
preventDefault: true
|
|
300
|
-
});
|
|
293
|
+
var bind = useDrag(onDrag, dragOptions);
|
|
301
294
|
var springedProgress = useSpringValue(progress, dragging || disabled, springParams);
|
|
302
295
|
useEffect(function () {
|
|
303
296
|
if (wantedProgress !== progress && !refDragging.current) {
|
package/lib/hooks.js
CHANGED
|
@@ -254,25 +254,16 @@ function useSpringValue(wantedProgress, immediate, params) {
|
|
|
254
254
|
var onChange = react.useCallback(function (spring) {
|
|
255
255
|
return setProgress(getValueFromSpring(spring));
|
|
256
256
|
}, [setProgress]);
|
|
257
|
+
core$1.useSpring(_objectSpread__default["default"]({
|
|
258
|
+
progress: wantedProgress,
|
|
259
|
+
onChange: onChange,
|
|
260
|
+
immediate: immediate
|
|
261
|
+
}, params)); // useEffect(() => {
|
|
262
|
+
// if (wantedProgress !== null) {
|
|
263
|
+
// api.start({ progress: wantedProgress, immediate, ...params });
|
|
264
|
+
// }
|
|
265
|
+
// }, [wantedProgress, immediate, params, api]);
|
|
257
266
|
|
|
258
|
-
var _useSpring = core$1.useSpring(function () {
|
|
259
|
-
return _objectSpread__default["default"]({
|
|
260
|
-
progress: wantedProgress,
|
|
261
|
-
onChange: onChange,
|
|
262
|
-
immediate: immediate
|
|
263
|
-
}, params);
|
|
264
|
-
}),
|
|
265
|
-
_useSpring2 = _slicedToArray__default["default"](_useSpring, 2),
|
|
266
|
-
api = _useSpring2[1];
|
|
267
|
-
|
|
268
|
-
react.useEffect(function () {
|
|
269
|
-
if (wantedProgress !== null) {
|
|
270
|
-
api.start(_objectSpread__default["default"]({
|
|
271
|
-
progress: wantedProgress,
|
|
272
|
-
immediate: immediate
|
|
273
|
-
}, params));
|
|
274
|
-
}
|
|
275
|
-
}, [wantedProgress, immediate, params, api]);
|
|
276
267
|
return immediate ? wantedProgress : progress;
|
|
277
268
|
}
|
|
278
269
|
|
|
@@ -290,7 +281,12 @@ function useDragProgress() {
|
|
|
290
281
|
_ref$onProgress = _ref.onProgress,
|
|
291
282
|
onProgress = _ref$onProgress === void 0 ? null : _ref$onProgress,
|
|
292
283
|
_ref$springParams = _ref.springParams,
|
|
293
|
-
springParams = _ref$springParams === void 0 ? undefined : _ref$springParams
|
|
284
|
+
springParams = _ref$springParams === void 0 ? undefined : _ref$springParams,
|
|
285
|
+
_ref$dragOptions = _ref.dragOptions,
|
|
286
|
+
dragOptions = _ref$dragOptions === void 0 ? {
|
|
287
|
+
filterTaps: true,
|
|
288
|
+
preventDefault: true
|
|
289
|
+
} : _ref$dragOptions;
|
|
294
290
|
|
|
295
291
|
var refDragging = react.useRef(false);
|
|
296
292
|
|
|
@@ -304,7 +300,7 @@ function useDragProgress() {
|
|
|
304
300
|
progress = _useState2$.progress,
|
|
305
301
|
setDragState = _useState2[1];
|
|
306
302
|
|
|
307
|
-
var
|
|
303
|
+
var onDrag = react.useCallback(function (gestureState) {
|
|
308
304
|
if (disabled) {
|
|
309
305
|
return;
|
|
310
306
|
}
|
|
@@ -332,10 +328,7 @@ function useDragProgress() {
|
|
|
332
328
|
onProgress(newProgress, gestureState);
|
|
333
329
|
}
|
|
334
330
|
}, [setDragState, disabled, onTap, computeProgress, setDragState, onProgress]);
|
|
335
|
-
var bind = react$1.useDrag(
|
|
336
|
-
filterTaps: true,
|
|
337
|
-
preventDefault: true
|
|
338
|
-
});
|
|
331
|
+
var bind = react$1.useDrag(onDrag, dragOptions);
|
|
339
332
|
var springedProgress = useSpringValue(progress, dragging || disabled, springParams);
|
|
340
333
|
react.useEffect(function () {
|
|
341
334
|
if (wantedProgress !== progress && !refDragging.current) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micromag/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.204",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"javascript"
|
|
@@ -133,5 +133,5 @@
|
|
|
133
133
|
"publishConfig": {
|
|
134
134
|
"access": "public"
|
|
135
135
|
},
|
|
136
|
-
"gitHead": "
|
|
136
|
+
"gitHead": "3760b85f2b98c900c8ab9470c5d303074985cb4f"
|
|
137
137
|
}
|