Merge branch 'master' into gabrielam/add-multiline-to-editable-text

mondaycom · Dec 31, 2024 · 3c6e3b9 · 3c6e3b9
2 parents c2210dc + 7b86383
commit 3c6e3b9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.11.0](https://github.com/mondaycom/vibe/compare/@vibe/[email protected]...@vibe/[email protected]) (2024-12-31)
+
+
+### Features
+
+* **EditableTypography:** allow autoselect of text when going into edit mode ([#2691](https://github.com/mondaycom/vibe/issues/2691)) ([941fab2](https://github.com/mondaycom/vibe/commit/941fab2f94857e93b90f46eb42e5eb752c2f991f))
+
+
+
+
+
 ## [3.10.3](https://github.com/mondaycom/vibe/compare/@vibe/[email protected]...@vibe/[email protected]) (2024-12-30)
 
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vibe/core",
-  "version": "3.10.3",
+  "version": "3.11.0",
   "description": "Official monday.com UI resources for application development in React.js",
   "repository": {
     "type": "git",

diff --git a/packages/core/src/components/Modal/Modal/Modal.tsx b/packages/core/src/components/Modal/Modal/Modal.tsx
@@ -23,6 +23,9 @@ import { createPortal } from "react-dom";
 import usePortalTarget from "../hooks/usePortalTarget/usePortalTarget";
 import { LayerProvider } from "../../LayerProvider";
 
+// @ts-expect-error This is a precaution to support all possible module systems (ESM/CJS)
+const FocusLockComponent = (FocusLock.default || FocusLock) as typeof FocusLock;
+
 const Modal = forwardRef(
   (
     {
@@ -111,7 +114,7 @@ const Modal = forwardRef(
                     aria-hidden
                     style={zIndexStyle}
                   />
-                  <FocusLock returnFocus>
+                  <FocusLockComponent returnFocus>
                     <RemoveScroll forwardProps>
                       <motion.div
                         variants={modalAnimationVariants}
@@ -143,7 +146,7 @@ const Modal = forwardRef(
                         />
                       </motion.div>
                     </RemoveScroll>
-                  </FocusLock>
+                  </FocusLockComponent>
                 </>,
                 portalTargetElement
               )}