@tamagui/floating 3.0.0-beta.924.1 → 3.0.0

package/dist/cjs/interactions/useInteractions.cjs

@@ -21,60 +21,50 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var useInteractions_exports = {};
 __export(useInteractions_exports, { useInteractions: () => useInteractions });
 module.exports = __toCommonJS(useInteractions_exports);
+var import_react = require("react");
 function useInteractions(propsList) {
-	const filtered = propsList.filter(Boolean);
-	const referenceFns = /* @__PURE__ */ new Map();
-	const floatingFns = /* @__PURE__ */ new Map();
-	const itemFns = /* @__PURE__ */ new Map();
-	const referenceStatic = {};
-	const floatingStatic = {};
-	for (const props of filtered) {
-		if (props.reference) {
-			collectProps(props.reference, referenceFns, referenceStatic);
-		}
-		if (props.floating) {
-			collectProps(props.floating, floatingFns, floatingStatic);
-		}
-		if (props.item && typeof props.item === "object") {
-			collectProps(props.item, itemFns, {});
-		}
-	}
-	return {
-		getReferenceProps(userProps) {
-			return buildProps(referenceFns, referenceStatic, userProps);
-		},
-		getFloatingProps(userProps) {
-			return buildProps(floatingFns, floatingStatic, userProps);
-		},
-		getItemProps(userProps) {
-			return buildProps(itemFns, {}, userProps);
-		}
-	};
+	const referenceDeps = propsList.map((props) => props?.reference);
+	const floatingDeps = propsList.map((props) => props?.floating);
+	const itemDeps = propsList.map((props) => props?.item);
+	const getReferenceProps = (0, import_react.useCallback)((userProps) => mergeProps(referenceDeps, userProps), referenceDeps);
+	const getFloatingProps = (0, import_react.useCallback)((userProps) => mergeProps(floatingDeps, userProps), floatingDeps);
+	const getItemProps = (0, import_react.useCallback)((userProps) => mergeProps(itemDeps, userProps, true), itemDeps);
+	return (0, import_react.useMemo)(() => ({
+		getReferenceProps,
+		getFloatingProps,
+		getItemProps
+	}), [
+		getReferenceProps,
+		getFloatingProps,
+		getItemProps
+	]);
 }
-function collectProps(props, fnMap, staticMap) {
-	for (const key of Object.keys(props)) {
-		if (typeof props[key] === "function") {
-			let arr = fnMap.get(key);
-			if (!arr) {
-				arr = [];
-				fnMap.set(key, arr);
+function mergeProps(list, userProps, objectsOnly = false) {
+	const fnMap = /* @__PURE__ */ new Map();
+	const result = {};
+	for (const props of list) {
+		if (!props || objectsOnly && typeof props !== "object") continue;
+		for (const key of Object.keys(props)) {
+			const value = props[key];
+			if (typeof value === "function") {
+				let arr = fnMap.get(key);
+				if (!arr) {
+					arr = [];
+					fnMap.set(key, arr);
+				}
+				arr.push(value);
+			} else {
+				result[key] = value;
 			}
-			arr.push(props[key]);
-		} else {
-			staticMap[key] = props[key];
 		}
 	}
-}
-function buildProps(fnMap, staticProps, userProps) {
-	const result = { ...staticProps };
 	for (const [key, fns] of fnMap) {
-		const hookHandler = (...args) => {
+		result[key] = (...args) => {
 			for (const fn of fns) {
-				const result2 = fn(...args);
-				if (result2 !== void 0) return result2;
+				const out = fn(...args);
+				if (out !== void 0) return out;
 			}
 		};
-		result[key] = hookHandler;
 	}
 	if (userProps) {
 		for (const key of Object.keys(userProps)) {

package/dist/cjs/interactions/useInteractions.native.cjs

@@ -23,71 +23,76 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var useInteractions_exports = {};
 __export(useInteractions_exports, { useInteractions: () => useInteractions });
 module.exports = __toCommonJS(useInteractions_exports);
-function _type_of(obj) {
-	"@swc/helpers - typeof";
-	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
+var import_react = require("react");
 function useInteractions(propsList) {
-	var filtered = propsList.filter(Boolean);
-	var referenceFns = /* @__PURE__ */ new Map();
-	var floatingFns = /* @__PURE__ */ new Map();
-	var itemFns = /* @__PURE__ */ new Map();
-	var referenceStatic = {};
-	var floatingStatic = {};
-	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-	try {
-		for (var _iterator = filtered[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-			var props = _step.value;
-			if (props.reference) {
-				collectProps(props.reference, referenceFns, referenceStatic);
-			}
-			if (props.floating) {
-				collectProps(props.floating, floatingFns, floatingStatic);
-			}
-			if (props.item && _type_of(props.item) === "object") {
-				collectProps(props.item, itemFns, {});
-			}
-		}
-	} catch (err) {
-		_didIteratorError = true;
-		_iteratorError = err;
-	} finally {
-		try {
-			if (!_iteratorNormalCompletion && _iterator.return != null) {
-				_iterator.return();
-			}
-		} finally {
-			if (_didIteratorError) {
-				throw _iteratorError;
-			}
-		}
-	}
-	return {
-		getReferenceProps(userProps) {
-			return buildProps(referenceFns, referenceStatic, userProps);
-		},
-		getFloatingProps(userProps) {
-			return buildProps(floatingFns, floatingStatic, userProps);
-		},
-		getItemProps(userProps) {
-			return buildProps(itemFns, {}, userProps);
-		}
-	};
+	var referenceDeps = propsList.map(function(props) {
+		return props === null || props === void 0 ? void 0 : props.reference;
+	});
+	var floatingDeps = propsList.map(function(props) {
+		return props === null || props === void 0 ? void 0 : props.floating;
+	});
+	var itemDeps = propsList.map(function(props) {
+		return props === null || props === void 0 ? void 0 : props.item;
+	});
+	var getReferenceProps = (0, import_react.useCallback)(function(userProps) {
+		return mergeProps(referenceDeps, userProps);
+	}, referenceDeps);
+	var getFloatingProps = (0, import_react.useCallback)(function(userProps) {
+		return mergeProps(floatingDeps, userProps);
+	}, floatingDeps);
+	var getItemProps = (0, import_react.useCallback)(function(userProps) {
+		return mergeProps(itemDeps, userProps, true);
+	}, itemDeps);
+	return (0, import_react.useMemo)(function() {
+		return {
+			getReferenceProps,
+			getFloatingProps,
+			getItemProps
+		};
+	}, [
+		getReferenceProps,
+		getFloatingProps,
+		getItemProps
+	]);
 }
-function collectProps(props, fnMap, staticMap) {
+function mergeProps(list, userProps) {
+	var objectsOnly = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+	var fnMap = /* @__PURE__ */ new Map();
+	var result = {};
 	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
 	try {
-		for (var _iterator = Object.keys(props)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-			var key = _step.value;
-			if (typeof props[key] === "function") {
-				var arr = fnMap.get(key);
-				if (!arr) {
-					arr = [];
-					fnMap.set(key, arr);
+		for (var _iterator = list[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var props = _step.value;
+			if (!props || objectsOnly && typeof props !== "object") continue;
+			var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+			try {
+				for (var _iterator1 = Object.keys(props)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+					var key = _step1.value;
+					var value = props[key];
+					if (typeof value === "function") {
+						var arr = fnMap.get(key);
+						if (!arr) {
+							arr = [];
+							fnMap.set(key, arr);
+						}
+						arr.push(value);
+					} else {
+						result[key] = value;
+					}
+				}
+			} catch (err) {
+				_didIteratorError1 = true;
+				_iteratorError1 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+						_iterator1.return();
+					}
+				} finally {
+					if (_didIteratorError1) {
+						throw _iteratorError1;
+					}
 				}
-				arr.push(props[key]);
-			} else {
-				staticMap[key] = props[key];
 			}
 		}
 	} catch (err) {
@@ -104,70 +109,66 @@ function collectProps(props, fnMap, staticMap) {
 			}
 		}
 	}
-}
-function buildProps(fnMap, staticProps, userProps) {
-	var result = { ...staticProps };
-	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
 	try {
 		var _loop = function() {
-			var [key, fns] = _step.value;
-			var hookHandler = function() {
+			var [key2, fns] = _step2.value;
+			result[key2] = function() {
 				for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 					args[_key] = arguments[_key];
 				}
-				var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+				var _iteratorNormalCompletion4 = true, _didIteratorError4 = false, _iteratorError4 = void 0;
 				try {
-					for (var _iterator2 = fns[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-						var fn = _step2.value;
-						var result2 = fn(...args);
-						if (result2 !== void 0) return result2;
+					for (var _iterator4 = fns[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+						var fn = _step4.value;
+						var out = fn(...args);
+						if (out !== void 0) return out;
 					}
 				} catch (err) {
-					_didIteratorError2 = true;
-					_iteratorError2 = err;
+					_didIteratorError4 = true;
+					_iteratorError4 = err;
 				} finally {
 					try {
-						if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-							_iterator2.return();
+						if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
+							_iterator4.return();
 						}
 					} finally {
-						if (_didIteratorError2) {
-							throw _iteratorError2;
+						if (_didIteratorError4) {
+							throw _iteratorError4;
 						}
 					}
 				}
 			};
-			result[key] = hookHandler;
 		};
-		for (var _iterator = fnMap[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+		for (var _iterator2 = fnMap[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) _loop();
 	} catch (err) {
-		_didIteratorError = true;
-		_iteratorError = err;
+		_didIteratorError2 = true;
+		_iteratorError2 = err;
 	} finally {
 		try {
-			if (!_iteratorNormalCompletion && _iterator.return != null) {
-				_iterator.return();
+			if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+				_iterator2.return();
 			}
 		} finally {
-			if (_didIteratorError) {
-				throw _iteratorError;
+			if (_didIteratorError2) {
+				throw _iteratorError2;
 			}
 		}
 	}
 	if (userProps) {
-		var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+		var _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;
 		try {
 			var _loop1 = function() {
-				var key = _step1.value;
-				if (key === "style") {
+				var key2 = _step3.value;
+				if (key2 === "style") {
 					result.style = {
 						...result.style,
 						...userProps.style
 					};
-				} else if (typeof userProps[key] === "function" && result[key]) {
-					var hookFn = result[key];
-					var userFn = userProps[key];
-					result[key] = function() {
+				} else if (typeof userProps[key2] === "function" && result[key2]) {
+					var hookFn = result[key2];
+					var userFn = userProps[key2];
+					result[key2] = function() {
 						for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 							args[_key] = arguments[_key];
 						}
@@ -175,21 +176,21 @@ function buildProps(fnMap, staticProps, userProps) {
 						hookFn(...args);
 					};
 				} else {
-					result[key] = userProps[key];
+					result[key2] = userProps[key2];
 				}
 			};
-			for (var _iterator1 = Object.keys(userProps)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) _loop1();
+			for (var _iterator3 = Object.keys(userProps)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) _loop1();
 		} catch (err) {
-			_didIteratorError1 = true;
-			_iteratorError1 = err;
+			_didIteratorError3 = true;
+			_iteratorError3 = err;
 		} finally {
 			try {
-				if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-					_iterator1.return();
+				if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+					_iterator3.return();
 				}
 			} finally {
-				if (_didIteratorError1) {
-					throw _iteratorError1;
+				if (_didIteratorError3) {
+					throw _iteratorError3;
 				}
 			}
 		}

package/dist/cjs/interactions/useInteractions.native.js

@@ -23,71 +23,76 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var useInteractions_exports = {};
 __export(useInteractions_exports, { useInteractions: () => useInteractions });
 module.exports = __toCommonJS(useInteractions_exports);
-function _type_of(obj) {
-	"@swc/helpers - typeof";
-	return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
+var import_react = require("react");
 function useInteractions(propsList) {
-	var filtered = propsList.filter(Boolean);
-	var referenceFns = /* @__PURE__ */ new Map();
-	var floatingFns = /* @__PURE__ */ new Map();
-	var itemFns = /* @__PURE__ */ new Map();
-	var referenceStatic = {};
-	var floatingStatic = {};
-	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-	try {
-		for (var _iterator = filtered[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-			var props = _step.value;
-			if (props.reference) {
-				collectProps(props.reference, referenceFns, referenceStatic);
-			}
-			if (props.floating) {
-				collectProps(props.floating, floatingFns, floatingStatic);
-			}
-			if (props.item && _type_of(props.item) === "object") {
-				collectProps(props.item, itemFns, {});
-			}
-		}
-	} catch (err) {
-		_didIteratorError = true;
-		_iteratorError = err;
-	} finally {
-		try {
-			if (!_iteratorNormalCompletion && _iterator.return != null) {
-				_iterator.return();
-			}
-		} finally {
-			if (_didIteratorError) {
-				throw _iteratorError;
-			}
-		}
-	}
-	return {
-		getReferenceProps(userProps) {
-			return buildProps(referenceFns, referenceStatic, userProps);
-		},
-		getFloatingProps(userProps) {
-			return buildProps(floatingFns, floatingStatic, userProps);
-		},
-		getItemProps(userProps) {
-			return buildProps(itemFns, {}, userProps);
-		}
-	};
+	var referenceDeps = propsList.map(function(props) {
+		return props === null || props === void 0 ? void 0 : props.reference;
+	});
+	var floatingDeps = propsList.map(function(props) {
+		return props === null || props === void 0 ? void 0 : props.floating;
+	});
+	var itemDeps = propsList.map(function(props) {
+		return props === null || props === void 0 ? void 0 : props.item;
+	});
+	var getReferenceProps = (0, import_react.useCallback)(function(userProps) {
+		return mergeProps(referenceDeps, userProps);
+	}, referenceDeps);
+	var getFloatingProps = (0, import_react.useCallback)(function(userProps) {
+		return mergeProps(floatingDeps, userProps);
+	}, floatingDeps);
+	var getItemProps = (0, import_react.useCallback)(function(userProps) {
+		return mergeProps(itemDeps, userProps, true);
+	}, itemDeps);
+	return (0, import_react.useMemo)(function() {
+		return {
+			getReferenceProps,
+			getFloatingProps,
+			getItemProps
+		};
+	}, [
+		getReferenceProps,
+		getFloatingProps,
+		getItemProps
+	]);
 }
-function collectProps(props, fnMap, staticMap) {
+function mergeProps(list, userProps) {
+	var objectsOnly = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+	var fnMap = /* @__PURE__ */ new Map();
+	var result = {};
 	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
 	try {
-		for (var _iterator = Object.keys(props)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-			var key = _step.value;
-			if (typeof props[key] === "function") {
-				var arr = fnMap.get(key);
-				if (!arr) {
-					arr = [];
-					fnMap.set(key, arr);
+		for (var _iterator = list[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var props = _step.value;
+			if (!props || objectsOnly && typeof props !== "object") continue;
+			var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+			try {
+				for (var _iterator1 = Object.keys(props)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+					var key = _step1.value;
+					var value = props[key];
+					if (typeof value === "function") {
+						var arr = fnMap.get(key);
+						if (!arr) {
+							arr = [];
+							fnMap.set(key, arr);
+						}
+						arr.push(value);
+					} else {
+						result[key] = value;
+					}
+				}
+			} catch (err) {
+				_didIteratorError1 = true;
+				_iteratorError1 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+						_iterator1.return();
+					}
+				} finally {
+					if (_didIteratorError1) {
+						throw _iteratorError1;
+					}
 				}
-				arr.push(props[key]);
-			} else {
-				staticMap[key] = props[key];
 			}
 		}
 	} catch (err) {
@@ -104,70 +109,66 @@ function collectProps(props, fnMap, staticMap) {
 			}
 		}
 	}
-}
-function buildProps(fnMap, staticProps, userProps) {
-	var result = { ...staticProps };
-	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
 	try {
 		var _loop = function() {
-			var [key, fns] = _step.value;
-			var hookHandler = function() {
+			var [key2, fns] = _step2.value;
+			result[key2] = function() {
 				for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 					args[_key] = arguments[_key];
 				}
-				var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+				var _iteratorNormalCompletion4 = true, _didIteratorError4 = false, _iteratorError4 = void 0;
 				try {
-					for (var _iterator2 = fns[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-						var fn = _step2.value;
-						var result2 = fn(...args);
-						if (result2 !== void 0) return result2;
+					for (var _iterator4 = fns[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+						var fn = _step4.value;
+						var out = fn(...args);
+						if (out !== void 0) return out;
 					}
 				} catch (err) {
-					_didIteratorError2 = true;
-					_iteratorError2 = err;
+					_didIteratorError4 = true;
+					_iteratorError4 = err;
 				} finally {
 					try {
-						if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-							_iterator2.return();
+						if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
+							_iterator4.return();
 						}
 					} finally {
-						if (_didIteratorError2) {
-							throw _iteratorError2;
+						if (_didIteratorError4) {
+							throw _iteratorError4;
 						}
 					}
 				}
 			};
-			result[key] = hookHandler;
 		};
-		for (var _iterator = fnMap[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) _loop();
+		for (var _iterator2 = fnMap[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) _loop();
 	} catch (err) {
-		_didIteratorError = true;
-		_iteratorError = err;
+		_didIteratorError2 = true;
+		_iteratorError2 = err;
 	} finally {
 		try {
-			if (!_iteratorNormalCompletion && _iterator.return != null) {
-				_iterator.return();
+			if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+				_iterator2.return();
 			}
 		} finally {
-			if (_didIteratorError) {
-				throw _iteratorError;
+			if (_didIteratorError2) {
+				throw _iteratorError2;
 			}
 		}
 	}
 	if (userProps) {
-		var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+		var _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;
 		try {
 			var _loop1 = function() {
-				var key = _step1.value;
-				if (key === "style") {
+				var key2 = _step3.value;
+				if (key2 === "style") {
 					result.style = {
 						...result.style,
 						...userProps.style
 					};
-				} else if (typeof userProps[key] === "function" && result[key]) {
-					var hookFn = result[key];
-					var userFn = userProps[key];
-					result[key] = function() {
+				} else if (typeof userProps[key2] === "function" && result[key2]) {
+					var hookFn = result[key2];
+					var userFn = userProps[key2];
+					result[key2] = function() {
 						for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 							args[_key] = arguments[_key];
 						}
@@ -175,21 +176,21 @@ function buildProps(fnMap, staticProps, userProps) {
 						hookFn(...args);
 					};
 				} else {
-					result[key] = userProps[key];
+					result[key2] = userProps[key2];
 				}
 			};
-			for (var _iterator1 = Object.keys(userProps)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) _loop1();
+			for (var _iterator3 = Object.keys(userProps)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) _loop1();
 		} catch (err) {
-			_didIteratorError1 = true;
-			_iteratorError1 = err;
+			_didIteratorError3 = true;
+			_iteratorError3 = err;
 		} finally {
 			try {
-				if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-					_iterator1.return();
+				if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+					_iterator3.return();
 				}
 			} finally {
-				if (_didIteratorError1) {
-					throw _iteratorError1;
+				if (_didIteratorError3) {
+					throw _iteratorError3;
 				}
 			}
 		}