@yamada-ui/utils - npm Package Compare versions

Comparing version 1.5.1 to 1.5.2-dev-20240922184722

dist/index.d.ts

@@ -5,3 +5,3 @@ export { Dict, Length, Merge, MergeIfDefined, ObjectLiteral, Path, Primitive, Replace, StringLiteral, Union } from './index.types.js';
 export { funcAll, handlerAll, noop, runIfFunc } from './function.js';
-export { AsyncFnReturn, AsyncState, AsyncStateRetry, FunctionReturningPromise, MaybeRenderProp, PromiseType, UseIsMountedProps, UseIsMountedReturn, assignRef, createContext, createId, cx, findChildren, getValidChildren, includesChildren, isRefObject, isValidElement, mergeRefs, omitChildren, pickChildren, useAsync, useAsyncFunc, useAsyncRetry, useCallbackRef, useIsMounted, useMergeRefs, useSafeLayoutEffect, useUnmountEffect, useUpdateEffect } from './react.js';
+export { AsyncFnReturn, AsyncState, AsyncStateRetry, FunctionReturningPromise, MaybeRenderProp, PromiseType, UseIsMountedProps, UseIsMountedReturn, assignRef, createContext, createId, cx, findChildren, getValidChildren, includesChildren, isRefObject, isSomeElement, isValidElement, mergeRefs, omitChildren, pickChildren, useAsync, useAsyncFunc, useAsyncRetry, useCallbackRef, useIsMounted, useMergeRefs, useSafeLayoutEffect, useUnmountEffect, useUpdateEffect } from './react.js';
 export { FocusableElement, ariaAttr, createdDom, dataAttr, getActiveElement, getAllFocusable, getEventRelatedTarget, getOwnerDocument, getOwnerWindow, getPlatform, getPx, hasNegativeTabIndex, hasTabIndex, isActiveElement, isApple, isContains, isContentEditable, isDisabled, isElement, isFocusable, isHTMLElement, isHidden, isMac, isSafari, isTabbable, isTouchDevice, platform, vendor } from './dom.js';
@@ -8,0 +8,0 @@ export { antonym, escape, toCamelCase, toKebabCase, toTitleCase } from './string.js';

dist/index.js

@@ -111,2 +111,3 @@ "use strict";
   isSafari: () => isSafari,
+  isSomeElement: () => isSomeElement,
   isString: () => isString,
@@ -458,10 +459,35 @@ isTabbable: () => isTabbable,
 }
+function isSomeElement(child, type) {
+  var _a, _b;
+  if (child.type === type) return true;
+  if (!!child.__ui__ && !!type.__ui__) {
+    if (child.__ui__ === type.__ui__) return true;
+  }
+  const payload = child.type._payload;
+  if (!!((_a = payload == null ? void 0 : payload.value) == null ? void 0 : _a.__ui__) && !!type.__ui__) {
+    if (((_b = payload == null ? void 0 : payload.value) == null ? void 0 : _b.__ui__) === type.__ui__) return true;
+  }
+  return false;
+}
 function findChildren(children, ...types) {
-  return children.find((child) => types.some((type) => child.type === type)) ? children.sort(
-    (a, b) => types.some((type) => a.type === type) ? -1 : types.some((type) => b.type === type) ? 1 : 0
-  ) : [void 0, ...children];
+  const child = children.find(
+    (child2) => types.some((type) => isSomeElement(child2, type))
+  );
+  if (child) {
+    return children.sort((a, b) => {
+      if (types.some((type) => isSomeElement(a, type))) {
+        return -1;
+      } else if (types.some((type) => isSomeElement(b, type))) {
+        return 1;
+      } else {
+        return 0;
+      }
+    });
+  } else {
+    return [void 0, ...children];
+  }
 }
 function includesChildren(children, ...types) {
   return children.some((child) => {
-    if (types.some((type) => child.type === type)) return true;
+    if (types.some((type) => isSomeElement(child, type))) return true;
     const children2 = getValidChildren(child.props.children);
@@ -472,6 +498,10 @@ return children2.length ? includesChildren(children2, ...types) : false;
 function omitChildren(children, ...types) {
-  return children.filter((child) => types.every((type) => child.type !== type));
+  return children.filter(
+    (child) => types.every((type) => !isSomeElement(child, type))
+  );
 }
 function pickChildren(children, ...types) {
-  return children.filter((child) => types.every((type) => child.type === type));
+  return children.filter(
+    (child) => types.every((type) => isSomeElement(child, type))
+  );
 }
@@ -1318,2 +1348,3 @@ function cx(...classNames) {
   isSafari,
+  isSomeElement,
   isString,
@@ -1320,0 +1351,0 @@ isTabbable,

dist/react.d.ts

@@ -22,2 +22,3 @@ import * as React from 'react';
 declare function isValidElement(child: any): child is React.ReactNode;
+declare function isSomeElement(child: any, type: any): boolean;
 declare function findChildren(children: React.ReactElement[], ...types: (string | React.JSXElementConstructor<any>)[]): [React.ReactElement | undefined, ...React.ReactElement[]];
@@ -96,2 +97,2 @@ declare function includesChildren(children: React.ReactElement[], ...types: (string | React.JSXElementConstructor<any>)[]): boolean;
 
-export { type AsyncFnReturn, type AsyncState, type AsyncStateRetry, type FunctionReturningPromise, type MaybeRenderProp, type PromiseType, type UseIsMountedProps, type UseIsMountedReturn, assignRef, createContext, createId, cx, findChildren, getValidChildren, includesChildren, isRefObject, isValidElement, mergeRefs, omitChildren, pickChildren, useAsync, useAsyncFunc, useAsyncRetry, useCallbackRef, useIsMounted, useMergeRefs, useSafeLayoutEffect, useUnmountEffect, useUpdateEffect };
+export { type AsyncFnReturn, type AsyncState, type AsyncStateRetry, type FunctionReturningPromise, type MaybeRenderProp, type PromiseType, type UseIsMountedProps, type UseIsMountedReturn, assignRef, createContext, createId, cx, findChildren, getValidChildren, includesChildren, isRefObject, isSomeElement, isValidElement, mergeRefs, omitChildren, pickChildren, useAsync, useAsyncFunc, useAsyncRetry, useCallbackRef, useIsMounted, useMergeRefs, useSafeLayoutEffect, useUnmountEffect, useUpdateEffect };

dist/react.js

@@ -41,2 +41,3 @@ "use strict";
   isRefObject: () => isRefObject,
+  isSomeElement: () => isSomeElement,
   isValidElement: () => isValidElement2,
@@ -135,10 +136,35 @@ mergeRefs: () => mergeRefs,
 }
+function isSomeElement(child, type) {
+  var _a, _b;
+  if (child.type === type) return true;
+  if (!!child.__ui__ && !!type.__ui__) {
+    if (child.__ui__ === type.__ui__) return true;
+  }
+  const payload = child.type._payload;
+  if (!!((_a = payload == null ? void 0 : payload.value) == null ? void 0 : _a.__ui__) && !!type.__ui__) {
+    if (((_b = payload == null ? void 0 : payload.value) == null ? void 0 : _b.__ui__) === type.__ui__) return true;
+  }
+  return false;
+}
 function findChildren(children, ...types) {
-  return children.find((child) => types.some((type) => child.type === type)) ? children.sort(
-    (a, b) => types.some((type) => a.type === type) ? -1 : types.some((type) => b.type === type) ? 1 : 0
-  ) : [void 0, ...children];
+  const child = children.find(
+    (child2) => types.some((type) => isSomeElement(child2, type))
+  );
+  if (child) {
+    return children.sort((a, b) => {
+      if (types.some((type) => isSomeElement(a, type))) {
+        return -1;
+      } else if (types.some((type) => isSomeElement(b, type))) {
+        return 1;
+      } else {
+        return 0;
+      }
+    });
+  } else {
+    return [void 0, ...children];
+  }
 }
 function includesChildren(children, ...types) {
   return children.some((child) => {
-    if (types.some((type) => child.type === type)) return true;
+    if (types.some((type) => isSomeElement(child, type))) return true;
     const children2 = getValidChildren(child.props.children);
@@ -149,6 +175,10 @@ return children2.length ? includesChildren(children2, ...types) : false;
 function omitChildren(children, ...types) {
-  return children.filter((child) => types.every((type) => child.type !== type));
+  return children.filter(
+    (child) => types.every((type) => !isSomeElement(child, type))
+  );
 }
 function pickChildren(children, ...types) {
-  return children.filter((child) => types.every((type) => child.type === type));
+  return children.filter(
+    (child) => types.every((type) => isSomeElement(child, type))
+  );
 }
@@ -270,2 +300,3 @@ function cx(...classNames) {
   isRefObject,
+  isSomeElement,
   isValidElement,
@@ -272,0 +303,0 @@ mergeRefs,

package.json

 {
   "name": "@yamada-ui/utils",
-  "version": "1.5.1",
+  "version": "1.5.2-dev-20240922184722",
   "description": "Yamada UI utils",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

414269

increased by1.37%

Lines of code

5347

increased by1.85%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

No dependency changes