Update lego-bricks

webkom · Sep 18, 2024 · e7e3ab0 · e7e3ab0
1 parent 8ee52f9
commit e7e3ab0
Show file tree

Hide file tree

Showing 6 changed files with 1,359 additions and 175 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@webkom/lego-editor",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "A React editor written in TS with slate.js for lego-webapp",
   "type": "module",
   "main": "./dist/lego-editor.umd.cjs",
@@ -45,7 +45,7 @@
   },
   "homepage": "https://github.com/webkom/lego-editor#readme",
   "dependencies": {
-    "@webkom/lego-bricks": "^1.2.1",
+    "@webkom/lego-bricks": "^1.3.3",
     "classnames": "^2.2.6",
     "escape-html": "^1.0.3",
     "lodash": "^4.17.15",

diff --git a/src/components/ImageUpload.css b/src/components/ImageUpload.css
@@ -4,7 +4,6 @@
   display: flex;
   width: 325px;
   min-width: 70%;
-  height: 200.861px;
   min-height: 60%;
   outline: none;
 }

diff --git a/src/components/ImageUpload.tsx b/src/components/ImageUpload.tsx
@@ -112,13 +112,15 @@ const ImageUpload: FunctionComponent<Props> = ({ uploadFunction, cancel }) => {
     });
   };
 
-  const closeModal = (): void => {
-    cancel();
-    setShowModal(false);
+  const onModalOpenChange = (isOpen: boolean): void => {
+    if (!isOpen) {
+      cancel();
+    }
+    setShowModal(isOpen);
   };
 
   return (
-    <Modal show={showModal} onHide={closeModal}>
+    <Modal isOpen={showModal} onOpenChange={onModalOpenChange}>
       <Flex
         column
         alignItems="center"
@@ -140,10 +142,10 @@ const ImageUpload: FunctionComponent<Props> = ({ uploadFunction, cancel }) => {
           <ImageDrop onDrop={onDrop} />
         )}
         <Flex wrap gap={35}>
-          <Button flat onClick={closeModal}>
+          <Button flat onPress={() => onModalOpenChange(false)}>
             Avbryt
           </Button>
-          <Button secondary disabled={!currentImage} onClick={submitImage}>
+          <Button secondary disabled={!currentImage} onPress={submitImage}>
             Last opp
           </Button>
         </Flex>

diff --git a/src/components/LinkInput.tsx b/src/components/LinkInput.tsx
@@ -33,10 +33,7 @@ const LinkInput = (props: LinkInputProps): JSX.Element => {
     props.activeLink ? Node.string(props.activeLink[0]) : '',
   );
 
-  const submit = (
-    e?: React.FocusEvent | React.KeyboardEvent | React.MouseEvent,
-  ): void => {
-    e?.preventDefault();
+  const submit = (): void => {
     props.toggleLinkInput();
     if (url == '') {
       return;
@@ -58,13 +55,15 @@ const LinkInput = (props: LinkInputProps): JSX.Element => {
     }
   };
 
-  const closeModal = (): void => {
-    props.toggleLinkInput();
-    setShowModal(false);
+  const onModalOpenChange = (isOpen: boolean): void => {
+    if (!isOpen) {
+      props.toggleLinkInput();
+    }
+    setShowModal(isOpen);
   };
 
   return (
-    <Modal show={showModal} onHide={closeModal}>
+    <Modal isOpen={showModal} onOpenChange={onModalOpenChange}>
       <Flex column alignItems="center" justifyContent="center" gap={20}>
         <Flex column>
           <label className="_legoEditor_linkInput_label">
@@ -91,10 +90,10 @@ const LinkInput = (props: LinkInputProps): JSX.Element => {
           </label>
         </Flex>
         <Flex>
-          <Button flat onClick={closeModal}>
+          <Button flat onPress={() => onModalOpenChange(false)}>
             Avbryt
           </Button>
-          <Button secondary disabled={!isUrl(url)} onClick={submit}>
+          <Button secondary disabled={!isUrl(url)} onPress={submit}>
             Bruk
           </Button>
         </Flex>

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,7 +13,7 @@
     "rootDir": "./src",
     "outDir": "./dist",
     "downlevelIteration": true,
-
+    "skipLibCheck": true,
     "strict": true,
     "noImplicitAny": true,
     "strictNullChecks": true,