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
22 changes: 15 additions & 7 deletions apps/roam/src/components/canvas/DiscourseNodeUtil.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ import calcCanvasNodeSizeAndImg from "~/utils/calcCanvasNodeSizeAndImg";
import { createTextJsxFromSpans } from "./DiscourseRelationShape/helpers";
import { loadImage } from "~/utils/loadImage";
import { getRelationColor } from "./DiscourseRelationShape/DiscourseRelationUtil";
import { AUTO_CANVAS_RELATIONS_KEY } from "~/data/userSettings";
import { getSetting } from "~/utils/extensionSettings";

// TODO REPLACE WITH TLDRAW DEFAULTS
// https://github.com/tldraw/tldraw/pull/1580/files
Expand Down Expand Up @@ -544,13 +546,19 @@ export class BaseDiscourseNodeUtil extends ShapeUtil<DiscourseNodeShape> {
this.updateProps(shape.id, shape.type, { title: text, uid });

// Update Shape Relations
const relationIds = getRelationIds();
this.deleteRelationsInCanvas({ shape, relationIds });
await this.createExistingRelations({
shape,
relationIds,
finalUid: uid,
});
const autoCanvasRelations = getSetting<boolean>(
AUTO_CANVAS_RELATIONS_KEY,
false,
);
if (autoCanvasRelations) {
const relationIds = getRelationIds();
this.deleteRelationsInCanvas({ shape, relationIds });
await this.createExistingRelations({
shape,
relationIds,
finalUid: uid,
});
}

editor.setEditingShape(null);
}}
Expand Down
14 changes: 11 additions & 3 deletions apps/roam/src/components/canvas/Tldraw.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ import { createMigrations } from "./DiscourseRelationShape/discourseRelationMigr
import ToastListener, { dispatchToastEvent } from "./ToastListener";
import sendErrorEmail from "~/utils/sendErrorEmail";
import { TLDRAW_DATA_ATTRIBUTE } from "./tldrawStyles";
import { AUTO_CANVAS_RELATIONS_KEY } from "~/data/userSettings";
import { getSetting } from "~/utils/extensionSettings";

declare global {
interface Window {
Expand Down Expand Up @@ -829,9 +831,15 @@ const InsideEditorAndUiContext = ({
editor.sideEffects.registerAfterCreateHandler("shape", (shape) => {
const util = editor.getShapeUtil(shape);
if (util instanceof BaseDiscourseNodeUtil) {
void util.createExistingRelations({
shape: shape as DiscourseNodeShape,
});
const autoCanvasRelations = getSetting<boolean>(
AUTO_CANVAS_RELATIONS_KEY,
false,
);
if (autoCanvasRelations) {
void util.createExistingRelations({
shape: shape as DiscourseNodeShape,
});
}
}
});

Expand Down
23 changes: 23 additions & 0 deletions apps/roam/src/components/settings/HomePersonalSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
hideDiscourseFloatingMenu,
} from "~/components/DiscourseFloatingMenu";
import { NodeSearchMenuTriggerSetting } from "../DiscourseNodeSearchMenu";
import { AUTO_CANVAS_RELATIONS_KEY } from "~/data/userSettings";

const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
const extensionAPI = onloadArgs.extensionAPI;
Expand Down Expand Up @@ -143,6 +144,28 @@ const HomePersonalSettings = ({ onloadArgs }: { onloadArgs: OnloadArgs }) => {
</>
}
/>
<Checkbox
defaultChecked={
extensionAPI.settings.get(AUTO_CANVAS_RELATIONS_KEY) === true
}
onChange={(e) => {
const target = e.target as HTMLInputElement;
void extensionAPI.settings.set(
AUTO_CANVAS_RELATIONS_KEY,
target.checked,
);
}}
labelElement={
<>
Auto Canvas Relations
<Description
description={
"Automatically add discourse relations to canvas when a node is added"
}
/>
</>
}
/>
</div>
);
};
Expand Down
1 change: 1 addition & 0 deletions apps/roam/src/data/userSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ export const DEFAULT_CANVAS_PAGE_FORMAT_KEY = "default-canvas-page-format";
export const HIDE_METADATA_KEY = "hide-metadata";
export const DEFAULT_FILTERS_KEY = "default-filters";
export const QUERY_BUILDER_SETTINGS_KEY = "query-builder-settings";
export const AUTO_CANVAS_RELATIONS_KEY = "auto-canvas-relations";