fix: added second argument and warning to useAttrs- functions

limbo-works · May 3, 2024 · 9e658d2 · 9e658d2
1 parent ffd4efd
commit 9e658d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/composables/useAttrsExcept.js b/composables/useAttrsExcept.js
@@ -1,7 +1,10 @@
-export const useAttrsExcept = (excludes) => {
-	const attrs = useAttrs();
+export default function useAttrsExcept(excludes, $attrs) {
+	/* useAttrs() causes problems, so do pass in $attrs */
+	const attrs = $attrs || useAttrs();
 	const attrsToReturn = reactive({});
 
+	!$attrs && console.warn('useAttrsExcept() needs a second argument, an attrs object, to function properly. UseAttrs() causes problems.')
+
 	watch(
 		() => attrs,
 		() => {
@@ -17,4 +20,4 @@ export const useAttrsExcept = (excludes) => {
 	);
 
 	return attrsToReturn;
-};
+}
diff --git a/composables/useAttrsSome.js b/composables/useAttrsSome.js
@@ -1,12 +1,14 @@
-export const useAttrsSome = (subset) => {
-	const attrs = useAttrs();
+export default function useAttrsSome(subset, $attrs) {
+	/* useAttrs() causes problems, so do pass in $attrs */
+	const attrs = $attrs || useAttrs();
 	const attrsToReturn = reactive({});
 
+	!$attrs && console.warn('useAttrsSome() needs a second argument, an attrs object, to function properly. UseAttrs() causes problems.')
+
 	watch(
 		() => attrs,
 		() => {
 			subset ??= [];
-
 			for (const key in attrs) {
 				if (subset.includes(key)) {
 					attrsToReturn[key] = attrs[key];
@@ -17,4 +19,4 @@ export const useAttrsSome = (subset) => {
 	);
 
 	return attrsToReturn;
-};
+}