Sfoglia il codice sorgente

fix(style): box-sizing for minimap and hover activation for brand-adder

knoxnoe 10 mesi fa
parent
commit
ed090867df

+ 1 - 1
apps/demo-fixed-layout-simple/src/components/minimap.tsx

@@ -10,7 +10,7 @@ export const Minimap = () => {
         left: 16,
         left: 16,
         bottom: 51,
         bottom: 51,
         zIndex: 100,
         zIndex: 100,
-        width: 182,
+        width: 198,
       }}
       }}
     >
     >
       <MinimapRender
       <MinimapRender

+ 2 - 2
apps/demo-fixed-layout-simple/src/hooks/use-editor-props.tsx

@@ -3,12 +3,12 @@ import { useMemo } from 'react';
 import { createMinimapPlugin } from '@flowgram.ai/minimap-plugin';
 import { createMinimapPlugin } from '@flowgram.ai/minimap-plugin';
 import { defaultFixedSemiMaterials } from '@flowgram.ai/fixed-semi-materials';
 import { defaultFixedSemiMaterials } from '@flowgram.ai/fixed-semi-materials';
 import {
 import {
+  Field,
   type FixedLayoutProps,
   type FixedLayoutProps,
   FlowDocumentJSON,
   FlowDocumentJSON,
   FlowNodeRegistry,
   FlowNodeRegistry,
-  FlowTextKey,
-  Field,
   FlowRendererKey,
   FlowRendererKey,
+  FlowTextKey,
 } from '@flowgram.ai/fixed-layout-editor';
 } from '@flowgram.ai/fixed-layout-editor';
 
 
 import { NodeAdder } from '../components/node-adder';
 import { NodeAdder } from '../components/node-adder';

+ 1 - 1
apps/demo-fixed-layout/src/components/tools/styles.tsx

@@ -36,5 +36,5 @@ export const SelectZoom = styled.span`
 export const MinimapContainer = styled.div`
 export const MinimapContainer = styled.div`
   position: absolute;
   position: absolute;
   bottom: 60px;
   bottom: 60px;
-  width: 182px;
+  width: 198px;
 `;
 `;

+ 1 - 1
apps/demo-free-layout-simple/src/components/minimap.tsx

@@ -10,7 +10,7 @@ export const Minimap = () => {
         left: 226,
         left: 226,
         bottom: 51,
         bottom: 51,
         zIndex: 100,
         zIndex: 100,
-        width: 182,
+        width: 198,
       }}
       }}
     >
     >
       <MinimapRender
       <MinimapRender

+ 1 - 1
apps/demo-free-layout/src/components/tools/styles.tsx

@@ -39,7 +39,7 @@ export const SelectZoom = styled.span`
 export const MinimapContainer = styled.div`
 export const MinimapContainer = styled.div`
   position: absolute;
   position: absolute;
   bottom: 60px;
   bottom: 60px;
-  width: 182px;
+  width: 198px;
 `;
 `;
 
 
 export const UIIconMinimap = styled(IconMinimap)<{ visible: boolean }>`
 export const UIIconMinimap = styled(IconMinimap)<{ visible: boolean }>`

+ 16 - 0
common/config/rush/command-line.json

@@ -267,6 +267,14 @@
       "safeForSimultaneousRushProcesses": true,
       "safeForSimultaneousRushProcesses": true,
       "shellCommand": "concurrently --kill-others --prefix \"{name}\" --names [watch],[demo] -c white,blue \"rush build:watch --to-except @flowgram.ai/demo-fixed-layout\" \"cd apps/demo-fixed-layout && rushx dev\""
       "shellCommand": "concurrently --kill-others --prefix \"{name}\" --names [watch],[demo] -c white,blue \"rush build:watch --to-except @flowgram.ai/demo-fixed-layout\" \"cd apps/demo-fixed-layout && rushx dev\""
     },
     },
+    {
+      "name": "dev:demo-fixed-layout-simple",
+      "commandKind": "global",
+      "summary": "⭐️️ run dev in app/demo-fixed-layout-simple",
+      "autoinstallerName": "rush-commands",
+      "safeForSimultaneousRushProcesses": true,
+      "shellCommand": "concurrently --kill-others --prefix \"{name}\" --names [watch],[demo] -c white,blue \"rush build:watch --to-except @flowgram.ai/demo-fixed-layout-simple\" \"cd apps/demo-fixed-layout-simple && rushx dev\""
+    },
     {
     {
       "name": "dev:demo-free-layout",
       "name": "dev:demo-free-layout",
       "commandKind": "global",
       "commandKind": "global",
@@ -275,6 +283,14 @@
       "safeForSimultaneousRushProcesses": true,
       "safeForSimultaneousRushProcesses": true,
       "shellCommand": "concurrently --kill-others --prefix \"{name}\" --names [watch],[demo] -c white,blue \"rush build:watch --to-except @flowgram.ai/demo-free-layout\" \"cd apps/demo-free-layout && rushx dev\""
       "shellCommand": "concurrently --kill-others --prefix \"{name}\" --names [watch],[demo] -c white,blue \"rush build:watch --to-except @flowgram.ai/demo-free-layout\" \"cd apps/demo-free-layout && rushx dev\""
     },
     },
+    {
+      "name": "dev:demo-free-layout-simple",
+      "commandKind": "global",
+      "summary": "⭐️️ run dev in app/demo-free-layout-simple",
+      "autoinstallerName": "rush-commands",
+      "safeForSimultaneousRushProcesses": true,
+      "shellCommand": "concurrently --kill-others --prefix \"{name}\" --names [watch],[demo] -c white,blue \"rush build:watch --to-except @flowgram.ai/demo-free-layout-simple\" \"cd apps/demo-free-layout-simple && rushx dev\""
+    },
   ],
   ],
 
 
   /**
   /**

+ 3 - 3
packages/materials/fixed-semi-materials/src/components/branch-adder/index.tsx

@@ -5,9 +5,9 @@ import {
   type FlowNodeEntity,
   type FlowNodeEntity,
   FlowNodeRenderData,
   FlowNodeRenderData,
   FlowNodeTransformData,
   FlowNodeTransformData,
+  FlowOperationService,
   usePlayground,
   usePlayground,
   useService,
   useService,
-  FlowOperationService,
 } from '@flowgram.ai/fixed-layout-editor';
 } from '@flowgram.ai/fixed-layout-editor';
 import { IconPlus } from '@douyinfe/semi-icons';
 import { IconPlus } from '@douyinfe/semi-icons';
 
 
@@ -40,7 +40,7 @@ export default function BranchAdder(props: PropsType) {
   return (
   return (
     <Container
     <Container
       isVertical={isVertical}
       isVertical={isVertical}
-      activated={activated}
+      activated={activated || nodeData?.hovered}
       onMouseEnter={() => nodeData?.toggleMouseEnter()}
       onMouseEnter={() => nodeData?.toggleMouseEnter()}
       onMouseLeave={() => nodeData?.toggleMouseLeave()}
       onMouseLeave={() => nodeData?.toggleMouseLeave()}
     >
     >
@@ -49,7 +49,7 @@ export default function BranchAdder(props: PropsType) {
           addBranch();
           addBranch();
         }}
         }}
         aria-hidden="true"
         aria-hidden="true"
-        style={{ flexGrow: 1, textAlign: 'center' }}
+        style={{ flexGrow: 1, textAlign: 'center', cursor: 'pointer' }}
       >
       >
         <IconPlus />
         <IconPlus />
       </div>
       </div>

+ 3 - 2
packages/plugins/minimap-plugin/src/component.tsx

@@ -1,4 +1,4 @@
-import React, { CSSProperties, FC, useEffect, useRef, useState } from 'react';
+import React, { CSSProperties, useEffect, useRef, useState } from 'react';
 
 
 import { MinimapInactiveStyle } from './type';
 import { MinimapInactiveStyle } from './type';
 import { FlowMinimapService } from './service';
 import { FlowMinimapService } from './service';
@@ -11,7 +11,7 @@ interface MinimapProps {
   inactiveStyle?: Partial<MinimapInactiveStyle>;
   inactiveStyle?: Partial<MinimapInactiveStyle>;
 }
 }
 
 
-export const MinimapRender: FC<MinimapProps> = props => {
+export const MinimapRender: React.FC<MinimapProps> = (props) => {
   const {
   const {
     service,
     service,
     panelStyles = {},
     panelStyles = {},
@@ -72,6 +72,7 @@ export const MinimapRender: FC<MinimapProps> = props => {
           overflow: 'hidden',
           overflow: 'hidden',
           boxShadow:
           boxShadow:
             '0px 2.289px 6.867px 0px rgba(0, 0, 0, 0.08), 0px 4.578px 13.733px 0px rgba(0, 0, 0, 0.04)',
             '0px 2.289px 6.867px 0px rgba(0, 0, 0, 0.08), 0px 4.578px 13.733px 0px rgba(0, 0, 0, 0.04)',
+          boxSizing: 'border-box',
           padding: 8,
           padding: 8,
           ...panelStyles,
           ...panelStyles,
         }}
         }}