@tamagui/web 3.0.0-beta.1551.1 → 3.0.0-beta.1564.1
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/cjs/eventHandling.cjs +10 -4
- package/dist/cjs/helpers/getSplitStyles.native.cjs +48 -1
- package/dist/cjs/helpers/getSplitStyles.native.js +48 -1
- package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
- package/dist/esm/eventHandling.mjs +10 -4
- package/dist/esm/eventHandling.mjs.map +1 -1
- package/dist/esm/helpers/getSplitStyles.native.js +48 -1
- package/dist/esm/helpers/getSplitStyles.native.js.map +1 -1
- package/package.json +16 -16
- package/src/eventHandling.ts +19 -4
- package/src/helpers/getSplitStyles.tsx +52 -5
- package/types/eventHandling.d.ts +12 -4
- package/types/eventHandling.d.ts.map +1 -1
- package/types/helpers/getSplitStyles.d.ts.map +1 -1
|
@@ -25,15 +25,21 @@ __export(eventHandling_exports, {
|
|
|
25
25
|
wrapWithGestureDetector: () => wrapWithGestureDetector
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(eventHandling_exports);
|
|
28
|
+
let lastTouch = -1e9;
|
|
29
|
+
const pressFrom = (touch, handler) => handler && ((e) => {
|
|
30
|
+
if (touch) lastTouch = e.timeStamp;
|
|
31
|
+
else if (e.timeStamp - lastTouch < 1e3) return;
|
|
32
|
+
handler(e);
|
|
33
|
+
});
|
|
28
34
|
function getWebEvents(events, webStyle = true) {
|
|
29
35
|
return {
|
|
30
36
|
onMouseEnter: events.onMouseEnter,
|
|
31
37
|
onMouseLeave: events.onMouseLeave,
|
|
32
38
|
[webStyle ? "onClick" : "onPress"]: events.onPress,
|
|
33
|
-
onMouseDown: events.onPressIn,
|
|
34
|
-
onMouseUp: events.onPressOut,
|
|
35
|
-
onTouchStart: events.onPressIn,
|
|
36
|
-
onTouchEnd: events.onPressOut,
|
|
39
|
+
onMouseDown: pressFrom(false, events.onPressIn),
|
|
40
|
+
onMouseUp: pressFrom(false, events.onPressOut),
|
|
41
|
+
onTouchStart: pressFrom(true, events.onPressIn),
|
|
42
|
+
onTouchEnd: pressFrom(true, events.onPressOut),
|
|
37
43
|
onFocus: events.onFocus,
|
|
38
44
|
onBlur: events.onBlur
|
|
39
45
|
};
|
|
@@ -931,7 +931,54 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
|
|
|
931
931
|
}
|
|
932
932
|
var direct = styleState;
|
|
933
933
|
var prevStyle = direct.flatPrevStyle;
|
|
934
|
-
if (prevStyle && styleState.style && !direct.flatStyleChanged && Object.keys(prevStyle).length === Object.keys(styleState.style).length)
|
|
934
|
+
if (prevStyle && styleState.style && !direct.flatStyleChanged && Object.keys(prevStyle).length === Object.keys(styleState.style).length) {
|
|
935
|
+
var previousTransform = prevStyle.transform;
|
|
936
|
+
var nextTransform = styleState.style.transform;
|
|
937
|
+
var transformMatches = previousTransform === nextTransform;
|
|
938
|
+
if (!transformMatches && Array.isArray(previousTransform) && Array.isArray(nextTransform) && previousTransform.length === nextTransform.length) {
|
|
939
|
+
transformMatches = true;
|
|
940
|
+
for (var index1 = 0; index1 < nextTransform.length; index1++) {
|
|
941
|
+
var previousPart = previousTransform[index1];
|
|
942
|
+
var nextPart = nextTransform[index1];
|
|
943
|
+
if (previousPart === nextPart) continue;
|
|
944
|
+
if (!previousPart || !nextPart || typeof previousPart !== "object" || typeof nextPart !== "object") {
|
|
945
|
+
transformMatches = false;
|
|
946
|
+
break;
|
|
947
|
+
}
|
|
948
|
+
var keys = Object.keys(nextPart);
|
|
949
|
+
if (keys.length !== Object.keys(previousPart).length) {
|
|
950
|
+
transformMatches = false;
|
|
951
|
+
break;
|
|
952
|
+
}
|
|
953
|
+
var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
|
|
954
|
+
try {
|
|
955
|
+
var _loop = function() {
|
|
956
|
+
var key9 = _step1.value;
|
|
957
|
+
var previousValue = previousPart[key9];
|
|
958
|
+
var nextValue = nextPart[key9];
|
|
959
|
+
if (previousValue !== nextValue && !(Array.isArray(previousValue) && Array.isArray(nextValue) && previousValue.length === nextValue.length && nextValue.every(function(value, valueIndex) {
|
|
960
|
+
return value === previousValue[valueIndex];
|
|
961
|
+
}))) {
|
|
962
|
+
transformMatches = false;
|
|
963
|
+
return "break";
|
|
964
|
+
}
|
|
965
|
+
};
|
|
966
|
+
for (var _iterator1 = keys[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) if (_loop() === "break") break;
|
|
967
|
+
} catch (err) {
|
|
968
|
+
_didIteratorError1 = true;
|
|
969
|
+
_iteratorError1 = err;
|
|
970
|
+
} finally {
|
|
971
|
+
try {
|
|
972
|
+
if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
|
|
973
|
+
} finally {
|
|
974
|
+
if (_didIteratorError1) throw _iteratorError1;
|
|
975
|
+
}
|
|
976
|
+
}
|
|
977
|
+
if (!transformMatches) break;
|
|
978
|
+
}
|
|
979
|
+
}
|
|
980
|
+
if (transformMatches) styleState.style = prevStyle;
|
|
981
|
+
}
|
|
935
982
|
var result = {
|
|
936
983
|
hasMedia,
|
|
937
984
|
fontFamily: styleState.fontFamily,
|
|
@@ -931,7 +931,54 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
|
|
|
931
931
|
}
|
|
932
932
|
var direct = styleState;
|
|
933
933
|
var prevStyle = direct.flatPrevStyle;
|
|
934
|
-
if (prevStyle && styleState.style && !direct.flatStyleChanged && Object.keys(prevStyle).length === Object.keys(styleState.style).length)
|
|
934
|
+
if (prevStyle && styleState.style && !direct.flatStyleChanged && Object.keys(prevStyle).length === Object.keys(styleState.style).length) {
|
|
935
|
+
var previousTransform = prevStyle.transform;
|
|
936
|
+
var nextTransform = styleState.style.transform;
|
|
937
|
+
var transformMatches = previousTransform === nextTransform;
|
|
938
|
+
if (!transformMatches && Array.isArray(previousTransform) && Array.isArray(nextTransform) && previousTransform.length === nextTransform.length) {
|
|
939
|
+
transformMatches = true;
|
|
940
|
+
for (var index1 = 0; index1 < nextTransform.length; index1++) {
|
|
941
|
+
var previousPart = previousTransform[index1];
|
|
942
|
+
var nextPart = nextTransform[index1];
|
|
943
|
+
if (previousPart === nextPart) continue;
|
|
944
|
+
if (!previousPart || !nextPart || typeof previousPart !== "object" || typeof nextPart !== "object") {
|
|
945
|
+
transformMatches = false;
|
|
946
|
+
break;
|
|
947
|
+
}
|
|
948
|
+
var keys = Object.keys(nextPart);
|
|
949
|
+
if (keys.length !== Object.keys(previousPart).length) {
|
|
950
|
+
transformMatches = false;
|
|
951
|
+
break;
|
|
952
|
+
}
|
|
953
|
+
var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
|
|
954
|
+
try {
|
|
955
|
+
var _loop = function() {
|
|
956
|
+
var key9 = _step1.value;
|
|
957
|
+
var previousValue = previousPart[key9];
|
|
958
|
+
var nextValue = nextPart[key9];
|
|
959
|
+
if (previousValue !== nextValue && !(Array.isArray(previousValue) && Array.isArray(nextValue) && previousValue.length === nextValue.length && nextValue.every(function(value, valueIndex) {
|
|
960
|
+
return value === previousValue[valueIndex];
|
|
961
|
+
}))) {
|
|
962
|
+
transformMatches = false;
|
|
963
|
+
return "break";
|
|
964
|
+
}
|
|
965
|
+
};
|
|
966
|
+
for (var _iterator1 = keys[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) if (_loop() === "break") break;
|
|
967
|
+
} catch (err) {
|
|
968
|
+
_didIteratorError1 = true;
|
|
969
|
+
_iteratorError1 = err;
|
|
970
|
+
} finally {
|
|
971
|
+
try {
|
|
972
|
+
if (!_iteratorNormalCompletion1 && _iterator1.return != null) _iterator1.return();
|
|
973
|
+
} finally {
|
|
974
|
+
if (_didIteratorError1) throw _iteratorError1;
|
|
975
|
+
}
|
|
976
|
+
}
|
|
977
|
+
if (!transformMatches) break;
|
|
978
|
+
}
|
|
979
|
+
}
|
|
980
|
+
if (transformMatches) styleState.style = prevStyle;
|
|
981
|
+
}
|
|
935
982
|
var result = {
|
|
936
983
|
hasMedia,
|
|
937
984
|
fontFamily: styleState.fontFamily,
|