Skip to content

Commit

Permalink
fix(Flow): react flow styles import
Browse files Browse the repository at this point in the history
  • Loading branch information
MEsteves22 authored and zettca committed Oct 17, 2023
1 parent 5f92bd9 commit 637db33
Show file tree
Hide file tree
Showing 4 changed files with 476 additions and 20 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"publish:test": "lerna publish --conventional-graduate --yes --no-git-tag-version --no-push",
"publish:release": "lerna publish --conventional-graduate --yes",
"publish:next": "lerna publish --conventional-prerelease --yes --preid next --dist-tag next",
"prepare": "npx husky install .config/husky"
"prepare": "npx husky install .config/husky",
"lab:flow": "node scripts/flow-styles"
},
"devDependencies": {
"@applitools/eyes-storybook": "^3.41.2",
Expand Down
43 changes: 24 additions & 19 deletions packages/lab/src/components/Flow/DroppableFlow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import ReactFlow, {
Edge,
Node,
} from "reactflow";
import "reactflow/dist/style.css";

import { Global } from "@emotion/react";

import { DragEndEvent, useDndMonitor, useDroppable } from "@dnd-kit/core";

Expand All @@ -24,6 +25,7 @@ import { ExtractNames, useUniqueId } from "@hitachivantara/uikit-react-core";
import { HvFlowNodeTypes } from "./types";
import { staticClasses, useClasses } from "./Flow.styles";
import { useFlowContext } from "./FlowContext";
import { flowStyles } from "./base";

export { staticClasses as flowClasses };

Expand Down Expand Up @@ -218,24 +220,27 @@ export const HvDroppableFlow = ({
};

return (
<div
id={elementId}
ref={setNodeRef}
className={cx(classes.root, className)}
>
<ReactFlow
nodes={nodes}
edges={validEdges}
nodeTypes={nodeTypes}
onNodesChange={handleNodesChange}
onEdgesChange={handleEdgesChange}
onConnect={handleConnect}
isValidConnection={isValidConnection}
defaultEdgeOptions={defaultEdgeOptions}
{...others}
<>
<Global styles={flowStyles} />
<div
id={elementId}
ref={setNodeRef}
className={cx(classes.root, className)}
>
{children}
</ReactFlow>
</div>
<ReactFlow
nodes={nodes}
edges={validEdges}
nodeTypes={nodeTypes}
onNodesChange={handleNodesChange}
onEdgesChange={handleEdgesChange}
onConnect={handleConnect}
isValidConnection={isValidConnection}
defaultEdgeOptions={defaultEdgeOptions}
{...others}
>
{children}
</ReactFlow>
</div>
</>
);
};

0 comments on commit 637db33

Please sign in to comment.