Converted locking to occur immediately on preview click

daledesilva · Aug 22, 2024 · 10bd523 · 10bd523
1 parent 67bedcb
commit 10bd523
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 36 deletions.
diff --git a/src/tldraw/drawing/drawing-embed-preview/drawing-embed-preview.tsx b/src/tldraw/drawing/drawing-embed-preview/drawing-embed-preview.tsx
@@ -13,9 +13,7 @@ interface DrawingEmbedProps {
     plugin: InkPlugin,
     onReady: Function,
     src: string,
-    isActive: boolean,
 	onClick: React.MouseEventHandler,
-	onEditClick: React.MouseEventHandler,
 	commonExtendedOptions: any[],
 }
 
@@ -69,15 +67,6 @@ export const DrawingEmbedPreview: React.FC<DrawingEmbedProps> = (props) => {
                     />
                 )}
             </>)}
-
-            {props.isActive && (
-                <PrimaryMenuBar>
-                    <TransitionMenu
-                        onEditClick = {props.onEditClick}
-                        menuOptions = {props.commonExtendedOptions}
-                    />
-                </PrimaryMenuBar>
-            )}
         </div>
     </>;
 

diff --git a/src/tldraw/drawing/drawing-embed.tsx b/src/tldraw/drawing/drawing-embed.tsx
@@ -115,19 +115,14 @@ export function DrawingEmbed (props: {
 				<DrawingEmbedPreview
 					plugin = {props.plugin}
 					onReady = {() => applyStaticEmbedHeight(null)}
-					isActive = {isActive}
 					src = {curPageData.previewUri || emptyDrawingSvgStr}
 					// src = {previewFilePath}
-					onClick = {(event) => {
-						event.preventDefault();
+					onClick = { async () => {
 						dispatch({ type: 'global-session/setActiveEmbedId', payload: embedId })
-					}}
-					onEditClick = { async () => {
 						const newPageData = await refreshPageData(props.plugin, props.fileRef);
 						setCurPageData(newPageData);
 						switchToEditMode();
 					}}
-					commonExtendedOptions = {commonExtendedOptions}
 				/>
 			)}
 			{state === 'edit' && (

diff --git a/src/tldraw/primary-menu-bar/primary-menu-bar.tsx b/src/tldraw/primary-menu-bar/primary-menu-bar.tsx
@@ -57,6 +57,7 @@ export const PrimaryMenuBar = (props: PrimaryMenuBarProps) => {
 
     function initFocusHandlers() {
         const parentEmbedEl = primaryMenuBarElRef.current?.closest('.ddc_ink_embed');
+        console.log('parentEmbedEl', parentEmbedEl)
         if(!parentEmbedEl) return;
         parentEmbedEl.addEventListener('focusin', handleFocusIn)
         parentEmbedEl.addEventListener('focusout', handleFocusOut)

diff --git a/src/tldraw/writing/writing-embed-preview/writing-embed-preview.tsx b/src/tldraw/writing/writing-embed-preview/writing-embed-preview.tsx
@@ -9,17 +9,14 @@ import InkPlugin from 'src/main';
 //////////
 //////////
 
-interface WritingEmbedProps {
+interface WritingEmbedPreviewProps {
     plugin: InkPlugin,
     onReady: Function,
     src: string,
-    isActive: boolean,
 	onClick: React.MouseEventHandler,
-	onEditClick: React.MouseEventHandler,
-	commonExtendedOptions: any[],
 }
 
-export const WritingEmbedPreview: React.FC<WritingEmbedProps> = (props) => {
+export const WritingEmbedPreview: React.FC<WritingEmbedPreviewProps> = (props) => {
     const svgRef = React.useRef(null);
 
     // Check if src is a pnd DataURI. If not, it's an SVG
@@ -71,14 +68,6 @@ export const WritingEmbedPreview: React.FC<WritingEmbedProps> = (props) => {
                 />
             </>)}
 
-            {props.isActive && (
-                <PrimaryMenuBar>
-                    <TransitionMenu
-                        onEditClick = {props.onEditClick}
-                        menuOptions = {props.commonExtendedOptions}
-                    />
-                </PrimaryMenuBar>
-            )}
         </div>
     </>;
 

diff --git a/src/tldraw/writing/writing-embed.tsx b/src/tldraw/writing/writing-embed.tsx
@@ -122,19 +122,14 @@ export function WritingEmbed (props: {
 				<WritingEmbedPreview
 					plugin = {props.plugin}
 					onReady = {() => applyStaticEmbedHeight(null)}
-					isActive = {isActive}
 					src = {curPageData.previewUri || emptyWritingSvg }
 					// src = {previewFilePath}
-					onClick = {(event) => {
-						event.preventDefault();
+					onClick = {async (event) => {
 						dispatch({ type: 'global-session/setActiveEmbedId', payload: embedId })
-					}}
-					onEditClick = { async () => {
 						const newPageData = await refreshPageData(props.plugin, props.fileRef);
 						setCurPageData(newPageData);
 						switchToEditMode();
 					}}
-					commonExtendedOptions = {commonExtendedOptions}
 				/>
 			)}
 			{state === 'edit' && (