Skip to content

Fix: incomplete dashed cutting hint #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ui/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,3 @@
.react-flow__node-scope.selected {
border-width: 2px;
}

.react-flow__node.cutting {
/* box-shadow: 0px 0px 8px 0px rgba(100, 100, 100, 0.5); */
/* a dashed red border */
border: 2px dashed red;
}
1 change: 0 additions & 1 deletion ui/src/components/Canvas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ function CanvasImpl() {
setShowContextMenu(true);
setPoints({ x: event.pageX, y: event.pageY });
setClient({ x: event.clientX, y: event.clientY });
console.log(showContextMenu, points, client);
};

useEffect(() => {
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/MyMonaco.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,13 @@ export const MyMonaco = memo<MyMonacoProps>(function MyMonaco({
const setPodFocus = useStore(store, (state) => state.setPodFocus);
const setPodBlur = useStore(store, (state) => state.setPodBlur);
const nodesMap = useStore(store, (state) => state.ydoc.getMap<Node>("pods"));
const annotations = useStore(store, (state) => state.pods[id].annotations);
const annotations = useStore(store, (state) => state.pods[id]?.annotations);
const showAnnotations = useStore(store, (state) => state.showAnnotations);
const scopedVars = useStore(store, (state) => state.scopedVars);
const updateView = useStore(store, (state) => state.updateView);

const value = getPod(id).content || "";
let lang = getPod(id).lang || "javascript";
const value = getPod(id)?.content || "";
let lang = getPod(id)?.lang || "javascript";
const onChange = (value) => setPodContent({ id, content: value });
let [editor, setEditor] =
useState<monaco.editor.IStandaloneCodeEditor | null>(null);
Expand Down
26 changes: 21 additions & 5 deletions ui/src/components/nodes/Code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,17 +241,18 @@ export const CodeNode = memo<NodeProps>(function ({
const [layout, setLayout] = useState("bottom");
const isRightLayout = layout === "right";
const setPodName = useStore(store, (state) => state.setPodName);
const setPodGeo = useStore(store, (state) => state.setPodGeo);
const getPod = useStore(store, (state) => state.getPod);
const setCutting = useStore(store, (state) => state.setCutting);
const pod = getPod(id);
const isGuest = useStore(store, (state) => state.role === "GUEST");
const width = useStore(store, (state) => state.pods[id]?.width);
const isPodFocused = useStore(store, (state) => state.pods[id]?.focus);
const index = useStore(
store,
(state) => state.pods[id]?.result?.count || " "
);
const inputRef = useRef<HTMLInputElement>(null);
const updateView = useStore(store, (state) => state.updateView);
const isCutting = useStore(store, (state) => state.cuttingId === id);

const showResult = useStore(
store,
Expand All @@ -270,9 +271,21 @@ export const CodeNode = memo<NodeProps>(function ({
if (node) {
node.style = { ...node.style, width: size.width };
nodesMap.set(id, node);
setPodGeo(
id,
{
parent: node.parentNode ? node.parentNode : "ROOT",
x: node.position.x,
y: node.position.y,
width: size.width!,
height: node.height!,
},
true
);
updateView();
}
},
[id, nodesMap]
[id, nodesMap, setPodGeo, updateView]
);

useEffect(() => {
Expand Down Expand Up @@ -337,13 +350,16 @@ export const CodeNode = memo<NodeProps>(function ({
<Box
id={"reactflow_node_code_" + id}
sx={{
border: "solid 1px #d6dee6",
border: "1px #d6dee6",
borderWidth: pod.ispublic ? "4px" : "2px",
borderRadius: "4px",
borderStyle: isCutting ? "dashed" : "solid",
width: "100%",
height: "100%",
backgroundColor: "rgb(244, 246, 248)",
borderColor: pod.ispublic
borderColor: isCutting
? "red"
: pod.ispublic
? "green"
: selected
? "#003c8f"
Expand Down
35 changes: 26 additions & 9 deletions ui/src/components/nodes/Rich.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -293,22 +293,39 @@ export const RichNode = memo<Props>(function ({
// const pod = useStore(store, (state) => state.pods[id]);
const setPodName = useStore(store, (state) => state.setPodName);
const getPod = useStore(store, (state) => state.getPod);
const setPodGeo = useStore(store, (state) => state.setPodGeo);
const pod = getPod(id);
const isGuest = useStore(store, (state) => state.role === "GUEST");
const width = useStore(store, (state) => state.pods[id]?.width);
const isPodFocused = useStore(store, (state) => state.pods[id]?.focus);
const devMode = useStore(store, (state) => state.devMode);
const inputRef = useRef<HTMLInputElement>(null);

const onResize = useCallback((e, data) => {
const { size } = data;
const node = nodesMap.get(id);
if (node) {
node.style = { ...node.style, width: size.width };
nodesMap.set(id, node);
}
}, []);
const nodesMap = useStore(store, (state) => state.ydoc.getMap<Node>("pods"));
const updateView = useStore(store, (state) => state.updateView);

const onResize = useCallback(
(e, data) => {
const { size } = data;
const node = nodesMap.get(id);
if (node) {
node.style = { ...node.style, width: size.width };
nodesMap.set(id, node);
setPodGeo(
id,
{
parent: node.parentNode ? node.parentNode : "ROOT",
x: node.position.x,
y: node.position.y,
width: size.width!,
height: node.height!,
},
true
);
updateView();
}
},
[id, nodesMap, setPodGeo, updateView]
);

useEffect(() => {
if (!data.name) return;
Expand Down
1 change: 0 additions & 1 deletion ui/src/lib/store/canvasSlice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ export const createCanvasSlice: StateCreator<MyState, [], [], CanvasSlice> = (
// className: get().dragHighlight === node.id ? "active" : "",
className: match(node.id)
.with(get().dragHighlight, () => "active")
.with(get().cuttingId, () => "cutting")
.otherwise(() => undefined),
}));
// 2. those from cuttingNode, pastingNode, which are temporary nodes
Expand Down