@react-stately/utils 3.1.1 → 3.3.0
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/dist/main.js +73 -1
- package/dist/main.js.map +1 -1
- package/dist/module.js +65 -1
- package/dist/module.js.map +1 -1
- package/dist/types.d.ts +6 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +1 -0
- package/src/number.ts +55 -0
- package/src/useControlledState.ts +1 -1
package/dist/main.js
CHANGED
|
@@ -24,7 +24,7 @@ function useControlledState(value, defaultValue, onChange) {
|
|
|
24
24
|
|
|
25
25
|
let onChangeCaller = function onChangeCaller(value) {
|
|
26
26
|
if (onChange) {
|
|
27
|
-
if (stateRef.current
|
|
27
|
+
if (!Object.is(stateRef.current, value)) {
|
|
28
28
|
for (var _len2 = arguments.length, onChangeArgs = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
29
29
|
onChangeArgs[_key2 - 1] = arguments[_key2];
|
|
30
30
|
}
|
|
@@ -79,4 +79,76 @@ function useControlledState(value, defaultValue, onChange) {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
exports.useControlledState = useControlledState;
|
|
82
|
+
|
|
83
|
+
/*
|
|
84
|
+
* Copyright 2020 Adobe. All rights reserved.
|
|
85
|
+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
86
|
+
* you may not use this file except in compliance with the License. You may obtain a copy
|
|
87
|
+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
88
|
+
*
|
|
89
|
+
* Unless required by applicable law or agreed to in writing, software distributed under
|
|
90
|
+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
91
|
+
* OF ANY KIND, either express or implied. See the License for the specific language
|
|
92
|
+
* governing permissions and limitations under the License.
|
|
93
|
+
*/
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* Takes a value and forces it to the closest min/max if it's outside. Also forces it to the closest valid step.
|
|
97
|
+
*/
|
|
98
|
+
function clamp(value, min, max) {
|
|
99
|
+
if (min === void 0) {
|
|
100
|
+
min = -Infinity;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
if (max === void 0) {
|
|
104
|
+
max = Infinity;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
let newValue = Math.min(Math.max(value, min), max);
|
|
108
|
+
return newValue;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
exports.clamp = clamp;
|
|
112
|
+
|
|
113
|
+
function snapValueToStep(value, min, max, step) {
|
|
114
|
+
let remainder = (value - (isNaN(min) ? 0 : min)) % step;
|
|
115
|
+
let snappedValue = Math.abs(remainder) * 2 >= step ? value + Math.sign(remainder) * (step - Math.abs(remainder)) : value - remainder;
|
|
116
|
+
|
|
117
|
+
if (!isNaN(min)) {
|
|
118
|
+
if (snappedValue < min) {
|
|
119
|
+
snappedValue = min;
|
|
120
|
+
} else if (!isNaN(max) && snappedValue > max) {
|
|
121
|
+
snappedValue = min + Math.floor((max - min) / step) * step;
|
|
122
|
+
}
|
|
123
|
+
} else if (!isNaN(max) && snappedValue > max) {
|
|
124
|
+
snappedValue = Math.floor(max / step) * step;
|
|
125
|
+
} // correct floating point behavior by rounding to step precision
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
let string = step.toString();
|
|
129
|
+
let index = string.indexOf('.');
|
|
130
|
+
let precision = index >= 0 ? string.length - index : 0;
|
|
131
|
+
|
|
132
|
+
if (precision > 0) {
|
|
133
|
+
let pow = Math.pow(10, precision);
|
|
134
|
+
snappedValue = Math.round(snappedValue * pow) / pow;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
return snappedValue;
|
|
138
|
+
}
|
|
139
|
+
/* Takes a value and rounds off to the number of digits. */
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
exports.snapValueToStep = snapValueToStep;
|
|
143
|
+
|
|
144
|
+
function toFixedNumber(value, digits, base) {
|
|
145
|
+
if (base === void 0) {
|
|
146
|
+
base = 10;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
const pow = Math.pow(base, digits);
|
|
150
|
+
return Math.round(value * pow) / pow;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
exports.toFixedNumber = toFixedNumber;
|
|
82
154
|
//# sourceMappingURL=main.js.map
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":";;;;;;AAcO,SAASA,kBAAT,CACLC,KADK,EAELC,YAFK,EAGLC,QAHK,EAI6D;AAClE,MAAI,CAACC,UAAD,EAAaC,aAAb,IAA8BC,QAAQ,CAACL,KAAK,IAAIC,YAAV,CAA1C;AACA,MAAIK,GAAG,GAAGC,MAAM,CAACP,KAAK,KAAKQ,SAAX,CAAhB;AACA,MAAIC,aAAa,GAAGH,GAAG,CAACI,OAAxB;AACA,MAAIC,YAAY,GAAGX,KAAK,KAAKQ,SAA7B,CAJkE,CAKlE;;AACA,MAAII,QAAQ,GAAGL,MAAM,CAACJ,UAAD,CAArB;;AACA,MAAIM,aAAa,KAAKE,YAAtB,EAAoC;AAClCE,IAAAA,OAAO,CAACC,IAAR,sCAA+CL,aAAa,GAAG,YAAH,GAAkB,cAA9E,cAAmGE,YAAY,GAAG,YAAH,GAAkB,cAAjI;AACD;;AAEDL,EAAAA,GAAG,CAACI,OAAJ,GAAcC,YAAd;AAEA,MAAII,QAAQ,GAAGC,WAAW,CAAC,UAAChB,KAAD,EAAoB;AAAA,sCAATiB,IAAS;AAATA,MAAAA,IAAS;AAAA;;AAC7C,QAAIC,cAAc,GAAG,SAAjBA,cAAiB,CAAClB,KAAD,EAA4B;AAC/C,UAAIE,QAAJ,EAAc;AACZ,
|
|
1
|
+
{"mappings":"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","sources":["./packages/@react-stately/utils/src/useControlledState.ts","./packages/@react-stately/utils/src/number.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {useCallback, useRef, useState} from 'react';\n\nexport function useControlledState<T>(\n value: T,\n defaultValue: T,\n onChange: (value: T, ...args: any[]) => void\n): [T, (value: T | ((prevState: T) => T), ...args: any[]) => void] {\n let [stateValue, setStateValue] = useState(value || defaultValue);\n let ref = useRef(value !== undefined);\n let wasControlled = ref.current;\n let isControlled = value !== undefined;\n // Internal state reference for useCallback\n let stateRef = useRef(stateValue);\n if (wasControlled !== isControlled) {\n console.warn(`WARN: A component changed from ${wasControlled ? 'controlled' : 'uncontrolled'} to ${isControlled ? 'controlled' : 'uncontrolled'}.`);\n }\n\n ref.current = isControlled;\n\n let setValue = useCallback((value, ...args) => {\n let onChangeCaller = (value, ...onChangeArgs) => {\n if (onChange) {\n if (!Object.is(stateRef.current, value)) {\n onChange(value, ...onChangeArgs);\n }\n }\n if (!isControlled) {\n stateRef.current = value;\n }\n };\n\n if (typeof value === 'function') {\n // this supports functional updates https://reactjs.org/docs/hooks-reference.html#functional-updates\n // when someone using useControlledState calls setControlledState(myFunc)\n // this will call our useState setState with a function as well which invokes myFunc and calls onChange with the value from myFunc\n // if we're in an uncontrolled state, then we also return the value of myFunc which to setState looks as though it was just called with myFunc from the beginning\n // otherwise we just return the controlled value, which won't cause a rerender because React knows to bail out when the value is the same\n let updateFunction = (oldValue, ...functionArgs) => {\n let interceptedValue = value(isControlled ? stateRef.current : oldValue, ...functionArgs);\n onChangeCaller(interceptedValue, ...args);\n if (!isControlled) {\n return interceptedValue;\n }\n return oldValue;\n };\n setStateValue(updateFunction);\n } else {\n if (!isControlled) {\n setStateValue(value);\n }\n onChangeCaller(value, ...args);\n }\n }, [isControlled, onChange]);\n\n // If a controlled component's value prop changes, we need to update stateRef\n if (isControlled) {\n stateRef.current = value;\n } else {\n value = stateValue;\n }\n\n return [value, setValue];\n}\n","/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\n/**\n * Takes a value and forces it to the closest min/max if it's outside. Also forces it to the closest valid step.\n */\nexport function clamp(value: number, min: number = -Infinity, max: number = Infinity): number {\n let newValue = Math.min(Math.max(value, min), max);\n return newValue;\n}\n\nexport function snapValueToStep(value: number, min: number, max: number, step: number): number {\n let remainder = ((value - (isNaN(min) ? 0 : min)) % step);\n let snappedValue = Math.abs(remainder) * 2 >= step\n ? value + Math.sign(remainder) * (step - Math.abs(remainder))\n : value - remainder;\n\n if (!isNaN(min)) {\n if (snappedValue < min) {\n snappedValue = min;\n } else if (!isNaN(max) && snappedValue > max) {\n snappedValue = min + Math.floor((max - min) / step) * step;\n }\n } else if (!isNaN(max) && snappedValue > max) {\n snappedValue = Math.floor(max / step) * step;\n }\n\n // correct floating point behavior by rounding to step precision\n let string = step.toString();\n let index = string.indexOf('.');\n let precision = index >= 0 ? string.length - index : 0;\n\n if (precision > 0) {\n let pow = Math.pow(10, precision);\n snappedValue = Math.round(snappedValue * pow) / pow;\n }\n\n return snappedValue;\n}\n\n/* Takes a value and rounds off to the number of digits. */\nexport function toFixedNumber(value: number, digits: number, base: number = 10): number {\n const pow = Math.pow(base, digits);\n\n return Math.round(value * pow) / pow;\n}\n"],"names":["useControlledState","value","defaultValue","onChange","stateValue","setStateValue","useState","ref","useRef","undefined","wasControlled","current","isControlled","stateRef","console","warn","setValue","useCallback","args","onChangeCaller","Object","is","onChangeArgs","updateFunction","oldValue","functionArgs","interceptedValue","clamp","min","max","Infinity","newValue","Math","snapValueToStep","step","remainder","isNaN","snappedValue","abs","sign","floor","string","toString","index","indexOf","precision","length","pow","round","toFixedNumber","digits","base"],"version":3,"file":"main.js.map"}
|
package/dist/module.js
CHANGED
|
@@ -19,7 +19,7 @@ export function useControlledState(value, defaultValue, onChange) {
|
|
|
19
19
|
|
|
20
20
|
let onChangeCaller = function onChangeCaller(value) {
|
|
21
21
|
if (onChange) {
|
|
22
|
-
if (stateRef.current
|
|
22
|
+
if (!Object.is(stateRef.current, value)) {
|
|
23
23
|
for (var _len2 = arguments.length, onChangeArgs = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
24
24
|
onChangeArgs[_key2 - 1] = arguments[_key2];
|
|
25
25
|
}
|
|
@@ -72,4 +72,68 @@ export function useControlledState(value, defaultValue, onChange) {
|
|
|
72
72
|
|
|
73
73
|
return [value, setValue];
|
|
74
74
|
}
|
|
75
|
+
|
|
76
|
+
/*
|
|
77
|
+
* Copyright 2020 Adobe. All rights reserved.
|
|
78
|
+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
79
|
+
* you may not use this file except in compliance with the License. You may obtain a copy
|
|
80
|
+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
81
|
+
*
|
|
82
|
+
* Unless required by applicable law or agreed to in writing, software distributed under
|
|
83
|
+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
84
|
+
* OF ANY KIND, either express or implied. See the License for the specific language
|
|
85
|
+
* governing permissions and limitations under the License.
|
|
86
|
+
*/
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Takes a value and forces it to the closest min/max if it's outside. Also forces it to the closest valid step.
|
|
90
|
+
*/
|
|
91
|
+
export function clamp(value, min, max) {
|
|
92
|
+
if (min === void 0) {
|
|
93
|
+
min = -Infinity;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (max === void 0) {
|
|
97
|
+
max = Infinity;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
let newValue = Math.min(Math.max(value, min), max);
|
|
101
|
+
return newValue;
|
|
102
|
+
}
|
|
103
|
+
export function snapValueToStep(value, min, max, step) {
|
|
104
|
+
let remainder = (value - (isNaN(min) ? 0 : min)) % step;
|
|
105
|
+
let snappedValue = Math.abs(remainder) * 2 >= step ? value + Math.sign(remainder) * (step - Math.abs(remainder)) : value - remainder;
|
|
106
|
+
|
|
107
|
+
if (!isNaN(min)) {
|
|
108
|
+
if (snappedValue < min) {
|
|
109
|
+
snappedValue = min;
|
|
110
|
+
} else if (!isNaN(max) && snappedValue > max) {
|
|
111
|
+
snappedValue = min + Math.floor((max - min) / step) * step;
|
|
112
|
+
}
|
|
113
|
+
} else if (!isNaN(max) && snappedValue > max) {
|
|
114
|
+
snappedValue = Math.floor(max / step) * step;
|
|
115
|
+
} // correct floating point behavior by rounding to step precision
|
|
116
|
+
|
|
117
|
+
|
|
118
|
+
let string = step.toString();
|
|
119
|
+
let index = string.indexOf('.');
|
|
120
|
+
let precision = index >= 0 ? string.length - index : 0;
|
|
121
|
+
|
|
122
|
+
if (precision > 0) {
|
|
123
|
+
let pow = Math.pow(10, precision);
|
|
124
|
+
snappedValue = Math.round(snappedValue * pow) / pow;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
return snappedValue;
|
|
128
|
+
}
|
|
129
|
+
/* Takes a value and rounds off to the number of digits. */
|
|
130
|
+
|
|
131
|
+
export function toFixedNumber(value, digits, base) {
|
|
132
|
+
if (base === void 0) {
|
|
133
|
+
base = 10;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
const pow = Math.pow(base, digits);
|
|
137
|
+
return Math.round(value * pow) / pow;
|
|
138
|
+
}
|
|
75
139
|
//# sourceMappingURL=module.js.map
|
package/dist/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":";OAcO,SAASA,kBAAT,CACLC,KADK,EAELC,YAFK,EAGLC,QAHK,EAI6D;AAClE,MAAI,CAACC,UAAD,EAAaC,aAAb,IAA8BC,QAAQ,CAACL,KAAK,IAAIC,YAAV,CAA1C;AACA,MAAIK,GAAG,GAAGC,MAAM,CAACP,KAAK,KAAKQ,SAAX,CAAhB;AACA,MAAIC,aAAa,GAAGH,GAAG,CAACI,OAAxB;AACA,MAAIC,YAAY,GAAGX,KAAK,KAAKQ,SAA7B,CAJkE,CAKlE;;AACA,MAAII,QAAQ,GAAGL,MAAM,CAACJ,UAAD,CAArB;;AACA,MAAIM,aAAa,KAAKE,YAAtB,EAAoC;AAClCE,IAAAA,OAAO,CAACC,IAAR,sCAA+CL,aAAa,GAAG,YAAH,GAAkB,cAA9E,cAAmGE,YAAY,GAAG,YAAH,GAAkB,cAAjI;AACD;;AAEDL,EAAAA,GAAG,CAACI,OAAJ,GAAcC,YAAd;AAEA,MAAII,QAAQ,GAAGC,WAAW,CAAC,UAAChB,KAAD,EAAoB;AAAA,sCAATiB,IAAS;AAATA,MAAAA,IAAS;AAAA;;AAC7C,QAAIC,cAAc,GAAG,SAAjBA,cAAiB,CAAClB,KAAD,EAA4B;AAC/C,UAAIE,QAAJ,EAAc;AACZ,
|
|
1
|
+
{"mappings":"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","sources":["./packages/@react-stately/utils/src/useControlledState.ts","./packages/@react-stately/utils/src/number.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {useCallback, useRef, useState} from 'react';\n\nexport function useControlledState<T>(\n value: T,\n defaultValue: T,\n onChange: (value: T, ...args: any[]) => void\n): [T, (value: T | ((prevState: T) => T), ...args: any[]) => void] {\n let [stateValue, setStateValue] = useState(value || defaultValue);\n let ref = useRef(value !== undefined);\n let wasControlled = ref.current;\n let isControlled = value !== undefined;\n // Internal state reference for useCallback\n let stateRef = useRef(stateValue);\n if (wasControlled !== isControlled) {\n console.warn(`WARN: A component changed from ${wasControlled ? 'controlled' : 'uncontrolled'} to ${isControlled ? 'controlled' : 'uncontrolled'}.`);\n }\n\n ref.current = isControlled;\n\n let setValue = useCallback((value, ...args) => {\n let onChangeCaller = (value, ...onChangeArgs) => {\n if (onChange) {\n if (!Object.is(stateRef.current, value)) {\n onChange(value, ...onChangeArgs);\n }\n }\n if (!isControlled) {\n stateRef.current = value;\n }\n };\n\n if (typeof value === 'function') {\n // this supports functional updates https://reactjs.org/docs/hooks-reference.html#functional-updates\n // when someone using useControlledState calls setControlledState(myFunc)\n // this will call our useState setState with a function as well which invokes myFunc and calls onChange with the value from myFunc\n // if we're in an uncontrolled state, then we also return the value of myFunc which to setState looks as though it was just called with myFunc from the beginning\n // otherwise we just return the controlled value, which won't cause a rerender because React knows to bail out when the value is the same\n let updateFunction = (oldValue, ...functionArgs) => {\n let interceptedValue = value(isControlled ? stateRef.current : oldValue, ...functionArgs);\n onChangeCaller(interceptedValue, ...args);\n if (!isControlled) {\n return interceptedValue;\n }\n return oldValue;\n };\n setStateValue(updateFunction);\n } else {\n if (!isControlled) {\n setStateValue(value);\n }\n onChangeCaller(value, ...args);\n }\n }, [isControlled, onChange]);\n\n // If a controlled component's value prop changes, we need to update stateRef\n if (isControlled) {\n stateRef.current = value;\n } else {\n value = stateValue;\n }\n\n return [value, setValue];\n}\n","/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\n/**\n * Takes a value and forces it to the closest min/max if it's outside. Also forces it to the closest valid step.\n */\nexport function clamp(value: number, min: number = -Infinity, max: number = Infinity): number {\n let newValue = Math.min(Math.max(value, min), max);\n return newValue;\n}\n\nexport function snapValueToStep(value: number, min: number, max: number, step: number): number {\n let remainder = ((value - (isNaN(min) ? 0 : min)) % step);\n let snappedValue = Math.abs(remainder) * 2 >= step\n ? value + Math.sign(remainder) * (step - Math.abs(remainder))\n : value - remainder;\n\n if (!isNaN(min)) {\n if (snappedValue < min) {\n snappedValue = min;\n } else if (!isNaN(max) && snappedValue > max) {\n snappedValue = min + Math.floor((max - min) / step) * step;\n }\n } else if (!isNaN(max) && snappedValue > max) {\n snappedValue = Math.floor(max / step) * step;\n }\n\n // correct floating point behavior by rounding to step precision\n let string = step.toString();\n let index = string.indexOf('.');\n let precision = index >= 0 ? string.length - index : 0;\n\n if (precision > 0) {\n let pow = Math.pow(10, precision);\n snappedValue = Math.round(snappedValue * pow) / pow;\n }\n\n return snappedValue;\n}\n\n/* Takes a value and rounds off to the number of digits. */\nexport function toFixedNumber(value: number, digits: number, base: number = 10): number {\n const pow = Math.pow(base, digits);\n\n return Math.round(value * pow) / pow;\n}\n"],"names":["useControlledState","value","defaultValue","onChange","stateValue","setStateValue","useState","ref","useRef","undefined","wasControlled","current","isControlled","stateRef","console","warn","setValue","useCallback","args","onChangeCaller","Object","is","onChangeArgs","updateFunction","oldValue","functionArgs","interceptedValue","clamp","min","max","Infinity","newValue","Math","snapValueToStep","step","remainder","isNaN","snappedValue","abs","sign","floor","string","toString","index","indexOf","precision","length","pow","round","toFixedNumber","digits","base"],"version":3,"file":"module.js.map"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
export function useControlledState<T>(value: T, defaultValue: T, onChange: (value: T, ...args: any[]) => void): [T, (value: T | ((prevState: T) => T), ...args: any[]) => void];
|
|
2
|
+
/**
|
|
3
|
+
* Takes a value and forces it to the closest min/max if it's outside. Also forces it to the closest valid step.
|
|
4
|
+
*/
|
|
5
|
+
export function clamp(value: number, min?: number, max?: number): number;
|
|
6
|
+
export function snapValueToStep(value: number, min: number, max: number, step: number): number;
|
|
7
|
+
export function toFixedNumber(value: number, digits: number, base?: number): number;
|
|
2
8
|
|
|
3
9
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AAcA,mCAAmC,CAAC,EAClC,KAAK,EAAE,CAAC,EACR,YAAY,EAAE,CAAC,EACf,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAC3C,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAwDjE","sources":["./packages/@react-stately/utils/src/packages/@react-stately/utils/src/useControlledState.ts","./packages/@react-stately/utils/src/packages/@react-stately/utils/src/index.ts"],"sourcesContent":[null,null],"names":[],"version":3,"file":"types.d.ts.map"}
|
|
1
|
+
{"mappings":"AAcA,mCAAmC,CAAC,EAClC,KAAK,EAAE,CAAC,EACR,YAAY,EAAE,CAAC,EACf,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAC3C,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC,CAwDjE;AC9DD;A;GAEG;AACH,sBAAsB,KAAK,EAAE,MAAM,EAAE,GAAG,GAAE,MAAkB,EAAE,GAAG,GAAE,MAAiB,GAAG,MAAM,CAG5F;AAED,gCAAgC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CA2B7F;AAGD,8BAA8B,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,MAAW,GAAG,MAAM,CAItF","sources":["./packages/@react-stately/utils/src/packages/@react-stately/utils/src/useControlledState.ts","./packages/@react-stately/utils/src/packages/@react-stately/utils/src/number.ts","./packages/@react-stately/utils/src/packages/@react-stately/utils/src/index.ts"],"sourcesContent":[null,null,null],"names":[],"version":3,"file":"types.d.ts.map"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-stately/utils",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0",
|
|
4
4
|
"description": "Spectrum UI components in React",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "dist/main.js",
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
"publishConfig": {
|
|
26
26
|
"access": "public"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "896eabe5521a0349a675c4773ed7629addd4b8c4"
|
|
29
29
|
}
|
package/src/index.ts
CHANGED
package/src/number.ts
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright 2020 Adobe. All rights reserved.
|
|
3
|
+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
* you may not use this file except in compliance with the License. You may obtain a copy
|
|
5
|
+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
|
+
*
|
|
7
|
+
* Unless required by applicable law or agreed to in writing, software distributed under
|
|
8
|
+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
9
|
+
* OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
|
+
* governing permissions and limitations under the License.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Takes a value and forces it to the closest min/max if it's outside. Also forces it to the closest valid step.
|
|
15
|
+
*/
|
|
16
|
+
export function clamp(value: number, min: number = -Infinity, max: number = Infinity): number {
|
|
17
|
+
let newValue = Math.min(Math.max(value, min), max);
|
|
18
|
+
return newValue;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function snapValueToStep(value: number, min: number, max: number, step: number): number {
|
|
22
|
+
let remainder = ((value - (isNaN(min) ? 0 : min)) % step);
|
|
23
|
+
let snappedValue = Math.abs(remainder) * 2 >= step
|
|
24
|
+
? value + Math.sign(remainder) * (step - Math.abs(remainder))
|
|
25
|
+
: value - remainder;
|
|
26
|
+
|
|
27
|
+
if (!isNaN(min)) {
|
|
28
|
+
if (snappedValue < min) {
|
|
29
|
+
snappedValue = min;
|
|
30
|
+
} else if (!isNaN(max) && snappedValue > max) {
|
|
31
|
+
snappedValue = min + Math.floor((max - min) / step) * step;
|
|
32
|
+
}
|
|
33
|
+
} else if (!isNaN(max) && snappedValue > max) {
|
|
34
|
+
snappedValue = Math.floor(max / step) * step;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// correct floating point behavior by rounding to step precision
|
|
38
|
+
let string = step.toString();
|
|
39
|
+
let index = string.indexOf('.');
|
|
40
|
+
let precision = index >= 0 ? string.length - index : 0;
|
|
41
|
+
|
|
42
|
+
if (precision > 0) {
|
|
43
|
+
let pow = Math.pow(10, precision);
|
|
44
|
+
snappedValue = Math.round(snappedValue * pow) / pow;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return snappedValue;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/* Takes a value and rounds off to the number of digits. */
|
|
51
|
+
export function toFixedNumber(value: number, digits: number, base: number = 10): number {
|
|
52
|
+
const pow = Math.pow(base, digits);
|
|
53
|
+
|
|
54
|
+
return Math.round(value * pow) / pow;
|
|
55
|
+
}
|
|
@@ -32,7 +32,7 @@ export function useControlledState<T>(
|
|
|
32
32
|
let setValue = useCallback((value, ...args) => {
|
|
33
33
|
let onChangeCaller = (value, ...onChangeArgs) => {
|
|
34
34
|
if (onChange) {
|
|
35
|
-
if (stateRef.current
|
|
35
|
+
if (!Object.is(stateRef.current, value)) {
|
|
36
36
|
onChange(value, ...onChangeArgs);
|
|
37
37
|
}
|
|
38
38
|
}
|