Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ export function StrokeProperties() {
const actualAction = useWeave((state) => state.actions.actual);

const nodePropertiesAction = useCollaborationRoom(
(state) => state.nodeProperties.action,
(state) => state.nodeProperties.action
);

const nodeCreateProps = useCollaborationRoom(
(state) => state.nodeProperties.createProps,
(state) => state.nodeProperties.createProps
);

const actualNode = React.useMemo(() => {
Expand Down Expand Up @@ -62,7 +62,7 @@ export function StrokeProperties() {
instance.updateNode(updatedNode);
}
},
[instance, actualAction, nodePropertiesAction],
[instance, actualAction, nodePropertiesAction]
);

if (!instance || !actualAction || !actualNode) {
Expand All @@ -71,7 +71,8 @@ export function StrokeProperties() {

if (!actualAction && !actualNode) return null;

if (["colorTokenTool", "frameTool"].includes(actualAction)) return null;
if (["colorTokenTool", "frameTool", "textTool"].includes(actualAction))
return null;

if (["text", "color-token", "frame"].includes(actualNode.type)) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ export function TextProperties() {
const actualAction = useWeave((state) => state.actions.actual);

const nodePropertiesAction = useCollaborationRoom(
(state) => state.nodeProperties.action,
(state) => state.nodeProperties.action
);

const nodeCreateProps = useCollaborationRoom(
(state) => state.nodeProperties.createProps,
(state) => state.nodeProperties.createProps
);

const actualNode = React.useMemo(() => {
Expand Down Expand Up @@ -67,7 +67,7 @@ export function TextProperties() {
instance.updateNode(updatedNode);
}
},
[instance, actualAction, nodePropertiesAction],
[instance, actualAction, nodePropertiesAction]
);

if (!instance || !actualAction || !actualNode) {
Expand All @@ -76,7 +76,10 @@ export function TextProperties() {

if (!actualAction && !actualNode) return null;

if (!["text"].includes(actualNode.type)) {
if (
!["textTool"].includes(actualAction) &&
!["text"].includes(actualNode.type)
) {
return null;
}

Expand Down
12 changes: 8 additions & 4 deletions code/components/room-components/overlay/node-properties.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ export const NodeProperties = () => {
const setNode = useWeave((state) => state.setNode);

const sidebarRightActive = useCollaborationRoom(
(state) => state.sidebar.right.active,
(state) => state.sidebar.right.active
);
const setSidebarActive = useCollaborationRoom(
(state) => state.setSidebarActive,
(state) => state.setSidebarActive
);
const setNodePropertiesAction = useCollaborationRoom(
(state) => state.setNodePropertiesAction,
(state) => state.setNodePropertiesAction
);

const nodePropertiesAction = useCollaborationRoom(
(state) => state.nodeProperties.action,
(state) => state.nodeProperties.action
);

React.useEffect(() => {
Expand All @@ -61,6 +61,7 @@ export const NodeProperties = () => {
"arrowTool",
"colorTokenTool",
"frameTool",
"textTool",
].includes(actualAction)
) {
setNodePropertiesAction("create");
Expand Down Expand Up @@ -128,6 +129,8 @@ export const NodeProperties = () => {
return "Color Token";
case "frameTool":
return "Frame";
case "textTool":
return "Text";
default:
return "Unknown";
}
Expand Down Expand Up @@ -212,6 +215,7 @@ export const NodeProperties = () => {
"arrowTool",
"colorTokenTool",
"frameTool",
"textTool",
].includes(actualAction)
) {
instance.cancelAction(actualAction);
Expand Down
Loading
Loading