@os-design/core 1.0.270 → 1.0.271

package/dist/Drawer/index.js

@@ -85,7 +85,7 @@ const Drawer = /*#__PURE__*/forwardRef(({
   onClose = () => {},
   size,
   children,
-  onClick = () => {},
+  onPointerDown = () => {},
   ...rest
 }, ref) => {
   const {
@@ -93,10 +93,10 @@ const Drawer = /*#__PURE__*/forwardRef(({
   } = useTheme();
   const mounted = useClosable(visible, theme.transitionDelay);
   useBodyScroll(!visible);
-  const clickHandler = useCallback(e => {
+  const pointerDownHandler = useCallback(e => {
     e.stopPropagation();
-    onClick(e);
-  }, [onClick]);
+    onPointerDown(e);
+  }, [onPointerDown]);
   const keyDownHandler = useCallback(e => {
     if (e.key === 'Escape') {
       e.stopPropagation();
@@ -108,7 +108,7 @@ const Drawer = /*#__PURE__*/forwardRef(({
     children: [/*#__PURE__*/_jsx(DrawerMask, {
       visible: visible
     }), /*#__PURE__*/_jsx(Container, {
-      onClick: onClose,
+      onPointerDown: onClose,
       children: /*#__PURE__*/_jsx(FocusLock, {
         autoFocus: false,
         children: /*#__PURE__*/_jsx(CloseDrawerContext.Provider, {
@@ -120,7 +120,7 @@ const Drawer = /*#__PURE__*/forwardRef(({
             size: size,
             tabIndex: -1,
             onKeyDown: keyDownHandler,
-            onClick: clickHandler,
+            onPointerDown: pointerDownHandler,
             role: "dialog",
             "aria-modal": true,
             ...rest,

package/dist/Modal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Modal/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,QAAQ,EAId,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAQN,MAAM,OAAO,CAAC;AAGf,OAAsB,EAAE,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE3E,KAAK,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;AAC7D,MAAM,WAAW,UAAW,SAAQ,WAAW,EAAE,QAAQ;IACvD;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB;;;;OAIG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;CACnB;AA2BD,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAC7C,eAAO,MAAM,SAAS;;SAiFa,MAEjC,WAAQ;iGAzET,CAAC;AAsJF,eAAO,MAAM,aAAa,cAF0B,IAEY,CAAC;AAEjE;;GAEG;AACH,QAAA,MAAM,KAAK,mFAyIV,CAAC;AAIF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Modal/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,QAAQ,EAId,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAQN,MAAM,OAAO,CAAC;AAGf,OAAsB,EAAE,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE3E,KAAK,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;AAC7D,MAAM,WAAW,UAAW,SAAQ,WAAW,EAAE,QAAQ;IACvD;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB;;;;OAIG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;CACnB;AA2BD,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAC7C,eAAO,MAAM,SAAS;;SAiFW,MAAO,WAEhC;iGAzEP,CAAC;AAsJF,eAAO,MAAM,aAAa,cAF0B,IAEY,CAAC;AAEjE;;GAEG;AACH,QAAA,MAAM,KAAK,mFAyIV,CAAC;AAIF,eAAe,KAAK,CAAC"}

package/dist/Modal/index.js

@@ -176,7 +176,7 @@ const Modal = /*#__PURE__*/forwardRef(({
   onOk,
   size,
   id,
-  onClick = () => {},
+  onPointerDown = () => {},
   children,
   ...rest
 }, ref) => {
@@ -188,14 +188,14 @@ const Modal = /*#__PURE__*/forwardRef(({
   useBodyScroll(!visible);
   const titleId = useMemo(() => `modal-title-${Math.random().toString(36).slice(2, 11)}`, []);
   const bodyId = useMemo(() => id || `modal-body-${Math.random().toString(36).slice(2, 11)}`, [id]);
-  const containerClickHandler = useCallback(e => {
+  const containerPointerDownHandler = useCallback(e => {
     e.stopPropagation();
     onClose();
   }, [onClose]);
-  const contentClickHandler = useCallback(e => {
+  const contentPointerDownHandler = useCallback(e => {
     e.stopPropagation();
-    onClick(e);
-  }, [onClick]);
+    onPointerDown(e);
+  }, [onPointerDown]);
   const contentKeyDownHandler = useCallback(e => {
     if (e.key === 'Escape') {
       e.stopPropagation();
@@ -208,7 +208,7 @@ const Modal = /*#__PURE__*/forwardRef(({
     children: [/*#__PURE__*/_jsx(ModalMask, {
       visible: visible
     }), /*#__PURE__*/_jsx(Container, {
-      onClick: containerClickHandler,
+      onPointerDown: containerPointerDownHandler,
       children: /*#__PURE__*/_jsx(FocusLock, {
         autoFocus: false,
         children: /*#__PURE__*/_jsx(CloseModalContext.Provider, {
@@ -218,7 +218,7 @@ const Modal = /*#__PURE__*/forwardRef(({
             size: size,
             tabIndex: -1,
             onKeyDown: contentKeyDownHandler,
-            onClick: contentClickHandler,
+            onPointerDown: contentPointerDownHandler,
             role: "dialog",
             "aria-modal": true,
             "aria-labelledby": ariaLabelledBy,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os-design/core",
-  "version": "1.0.270",
+  "version": "1.0.271",
   "license": "UNLICENSED",
   "repository": "git@gitlab.com:os-team/libs/os-design.git",
   "type": "module",
@@ -58,5 +58,5 @@
     "react": "18",
     "react-dom": "18"
   },
-  "gitHead": "32672b12ae0a6483602c25f5bde36fac4a8fa64d"
+  "gitHead": "8d072b274db8bc64fd6dc4f39b86d0960c5584a7"
 }

package/src/Drawer/index.tsx

@@ -149,7 +149,7 @@ const Drawer = forwardRef<HTMLDivElement, DrawerProps>(
       onClose = () => {},
       size,
       children,
-      onClick = () => {},
+      onPointerDown = () => {},
       ...rest
     },
     ref
@@ -159,12 +159,12 @@ const Drawer = forwardRef<HTMLDivElement, DrawerProps>(
 
     useBodyScroll(!visible);
 
-    const clickHandler = useCallback(
+    const pointerDownHandler = useCallback(
       (e) => {
         e.stopPropagation();
-        onClick(e);
+        onPointerDown(e);
       },
-      [onClick]
+      [onPointerDown]
     );
 
     const keyDownHandler = useCallback(
@@ -182,7 +182,7 @@ const Drawer = forwardRef<HTMLDivElement, DrawerProps>(
     return (
       <Portal>
         <DrawerMask visible={visible} />
-        <Container onClick={onClose}>
+        <Container onPointerDown={onClose}>
           {/* @ts-expect-error FocusLock has problems with types */}
           <FocusLock autoFocus={false}>
             <CloseDrawerContext.Provider value={onClose}>
@@ -193,7 +193,7 @@ const Drawer = forwardRef<HTMLDivElement, DrawerProps>(
                 size={size}
                 tabIndex={-1}
                 onKeyDown={keyDownHandler}
-                onClick={clickHandler}
+                onPointerDown={pointerDownHandler}
                 role='dialog'
                 aria-modal
                 {...rest}

package/src/Modal/index.tsx

@@ -13,7 +13,7 @@ import { ThemeOverrider, clr, useTheme } from '@os-design/theming';
 import { omitEmotionProps, useBodyScroll, useClosable } from '@os-design/utils';
 import React, {
   type KeyboardEvent,
-  type MouseEvent,
+  type PointerEvent,
   forwardRef,
   useCallback,
   useContext,
@@ -293,7 +293,7 @@ const Modal = forwardRef<HTMLDivElement, ModalProps>(
       onOk,
       size,
       id,
-      onClick = () => {},
+      onPointerDown = () => {},
       children,
       ...rest
     },
@@ -314,20 +314,20 @@ const Modal = forwardRef<HTMLDivElement, ModalProps>(
       [id]
     );
 
-    const containerClickHandler = useCallback(
-      (e: MouseEvent<HTMLDivElement>) => {
+    const containerPointerDownHandler = useCallback(
+      (e: PointerEvent<HTMLDivElement>) => {
         e.stopPropagation();
         onClose();
       },
       [onClose]
     );
 
-    const contentClickHandler = useCallback(
-      (e: MouseEvent<HTMLDivElement>) => {
+    const contentPointerDownHandler = useCallback(
+      (e: PointerEvent<HTMLDivElement>) => {
         e.stopPropagation();
-        onClick(e);
+        onPointerDown(e);
       },
-      [onClick]
+      [onPointerDown]
     );
 
     const contentKeyDownHandler = useCallback(
@@ -350,7 +350,7 @@ const Modal = forwardRef<HTMLDivElement, ModalProps>(
     return (
       <Portal>
         <ModalMask visible={visible} />
-        <Container onClick={containerClickHandler}>
+        <Container onPointerDown={containerPointerDownHandler}>
           {/* @ts-expect-error FocusLock has problems with types */}
           <FocusLock autoFocus={false}>
             <CloseModalContext.Provider value={onClose}>
@@ -359,7 +359,7 @@ const Modal = forwardRef<HTMLDivElement, ModalProps>(
                 size={size}
                 tabIndex={-1}
                 onKeyDown={contentKeyDownHandler}
-                onClick={contentClickHandler}
+                onPointerDown={contentPointerDownHandler}
                 role='dialog'
                 aria-modal
                 aria-labelledby={ariaLabelledBy}