Skip to content

Commit

Permalink
style: editor.sceneGraph.render -> editor.render
Browse files Browse the repository at this point in the history
  • Loading branch information
F-star committed Mar 1, 2024
1 parent 49db653 commit d0d52dd
Show file tree
Hide file tree
Showing 26 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion packages/core/src/canvas_dragger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export class CanvasDragger {
const viewportX = this.startViewportPos.x - dx / zoom;
const viewportY = this.startViewportPos.y - dy / zoom;
this.editor.viewportManager.setViewport({ x: viewportX, y: viewportY });
this.editor.sceneGraph.render();
this.editor.render();
}
};

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/clipboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export class ClipboardManager {
Graph.dMove(pastedGraphs, dx, dy);
}
}
editor.sceneGraph.render();
editor.render();
}

destroy() {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/commands/command_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class CommandManager {
console.log('------- [redo] batched end -----');
}

this.editor.sceneGraph.render();
this.editor.render();
this.emitStatusChange();
}
}
Expand Down Expand Up @@ -109,7 +109,7 @@ export class CommandManager {
console.log('------- [undo] batched end -----');
}

this.editor.sceneGraph.render();
this.editor.render();
this.emitStatusChange();
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/commands/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class GroupCmd implements ICommand {
}

this.editor.sceneGraph.children = newGraphs;
this.editor.sceneGraph.render();
this.editor.render();
}

redo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class ControlHandleManager {
this.setCustomHandles([]);
}
}
this.editor.sceneGraph.render();
this.editor.render();
};
bindEvents() {
this.editor.selectedElements.on('hoverItemChange', this.onHoverItemChange);
Expand Down Expand Up @@ -255,13 +255,13 @@ export class ControlHandleManager {
showCustomHandles() {
if (!this.customHandlesVisible) {
this.customHandlesVisible = true;
this.editor.sceneGraph.render();
this.editor.render();
}
}
hideCustomHandles() {
if (this.customHandlesVisible) {
this.customHandlesVisible = false;
this.editor.sceneGraph.render();
this.editor.render();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export class Editor {
this.autoSaveGraphs = new AutoSaveGraphs(this);

this.imgManager.eventEmitter.on('added', () => {
this.sceneGraph.render();
this.render();
});

const data = this.autoSaveGraphs.load();
Expand Down Expand Up @@ -154,7 +154,7 @@ export class Editor {
* 所以下面的 render 要异步执行
*/
Promise.resolve().then(() => {
this.sceneGraph.render();
this.render();
});
}
loadData(data: IEditorPaperData) {
Expand Down
34 changes: 17 additions & 17 deletions packages/core/src/host_event_manager/command_key_binding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class CommandKeyBinding {
// select all
const selectAllAction = () => {
editor.selectedElements.selectAll();
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'KeyA' },
Expand All @@ -70,7 +70,7 @@ export class CommandKeyBinding {
} else {
this.editor.toolManager.setActiveTool('select');
}
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { keyCode: 'Escape' },
Expand All @@ -83,7 +83,7 @@ export class CommandKeyBinding {
// toggle ruler
const toggleRulersAction = () => {
editor.setting.set('enableRuler', !editor.setting.get('enableRuler'));
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { shiftKey: true, keyCode: 'KeyR' },
Expand All @@ -95,7 +95,7 @@ export class CommandKeyBinding {
// zoom to fix
const zoomToFitAction = () => {
editor.zoomManager.zoomToFit();
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { shiftKey: true, keyCode: 'Digit1' },
Expand All @@ -106,7 +106,7 @@ export class CommandKeyBinding {
// zoom to selection
const zoomToSelectionAction = () => {
editor.zoomManager.zoomToSelection();
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { shiftKey: true, keyCode: 'Digit2' },
Expand All @@ -117,7 +117,7 @@ export class CommandKeyBinding {
// zoom in
const zoomInAction = () => {
editor.zoomManager.zoomIn({ enableLevel: true });
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'Equal' },
Expand All @@ -129,7 +129,7 @@ export class CommandKeyBinding {
// zoom out
const zoomOutAction = () => {
editor.zoomManager.zoomOut({ enableLevel: true });
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'Minus' },
Expand All @@ -141,7 +141,7 @@ export class CommandKeyBinding {
// zoom to 100%
const zoomTo100 = () => {
editor.zoomManager.setZoomAndUpdateViewport(1);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: [
Expand All @@ -163,7 +163,7 @@ export class CommandKeyBinding {
'enablePixelGrid',
!editor.setting.get('enablePixelGrid'),
);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'Quote' },
Expand All @@ -178,7 +178,7 @@ export class CommandKeyBinding {
'snapToPixelGrid',
!editor.setting.get('snapToPixelGrid'),
);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { shiftKey: true, metaKey: true, keyCode: 'Quote' },
Expand All @@ -191,7 +191,7 @@ export class CommandKeyBinding {
// front
const frontAction = () => {
arrangeAndRecord(editor, ArrangeType.Front);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { keyCode: 'BracketRight' },
Expand All @@ -203,7 +203,7 @@ export class CommandKeyBinding {
// back
const backAction = () => {
arrangeAndRecord(editor, ArrangeType.Back);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { keyCode: 'BracketLeft' },
Expand All @@ -215,7 +215,7 @@ export class CommandKeyBinding {
// forward
const forwardAction = () => {
arrangeAndRecord(editor, ArrangeType.Forward);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'BracketRight' },
Expand All @@ -228,7 +228,7 @@ export class CommandKeyBinding {
// backward
const backwardAction = () => {
arrangeAndRecord(editor, ArrangeType.Backward);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'BracketLeft' },
Expand All @@ -242,7 +242,7 @@ export class CommandKeyBinding {
// group
const groupAction = () => {
editor.selectedElements.group();
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, keyCode: 'KeyG' },
Expand All @@ -258,7 +258,7 @@ export class CommandKeyBinding {
editor,
editor.selectedElements.getItems(),
);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, shiftKey: true, keyCode: 'KeyH' },
Expand All @@ -274,7 +274,7 @@ export class CommandKeyBinding {
editor,
editor.selectedElements.getItems(),
);
editor.sceneGraph.render();
editor.render();
};
editor.keybindingManager.register({
key: { metaKey: true, shiftKey: true, keyCode: 'KeyL' },
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/host_event_manager/host_event_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export class HostEventManager {
center: point,
});
}
editor.sceneGraph.render();
editor.render();
} else {
if (
this.editor.canvasDragger.isActive() &&
Expand All @@ -150,7 +150,7 @@ export class HostEventManager {
event.deltaX / zoom,
event.deltaY / zoom,
);
editor.sceneGraph.render();
editor.render();
}
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class MoveGraphsKeyBinding {
this.editor.commandManager.disableRedoUndo();
this.editor.controlHandleManager.hideCustomHandles();
recordDebounce(movedEls);
editor.sceneGraph.render();
editor.render();
};

const handleKeyup = (e: KeyboardEvent) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/selected_elements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class SelectedElements {
this.editor.commandManager.pushCommand(
new RemoveGraphsCmd('Remove Elements', this.editor, this.items),
);
this.editor.sceneGraph.render();
this.editor.render();
}

selectAll() {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/service/align_and_record.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export const alignAndRecord = (editor: Editor, type: AlignType) => {
editor.commandManager.pushCommand(
new AlignCmd('Align ' + type, editor.selectedElements.getItems(), type),
);
editor.sceneGraph.render();
editor.render();
};
2 changes: 1 addition & 1 deletion packages/core/src/service/arrange_and_record.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ export const arrangeAndRecord = (editor: Editor, type: ArrangeType) => {
new ArrangeCmd('Arrange ' + type, editor, items, type),
);
}
editor.sceneGraph.render();
editor.render();
};
2 changes: 1 addition & 1 deletion packages/core/src/text/text_editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class TextEditor {

if (!this.editor.setting.get('keepToolSelectedAfterUse')) {
this.editor.selectedElements.setItems([text]);
this.editor.sceneGraph.render();
this.editor.render();
}

this.editor.commandManager.pushCommand(
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tools/tool_draw_graph.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export abstract class DrawGraphTool implements ITool {
this.editor.sceneGraph.addItems([this.drawingGraph]);

this.editor.selectedElements.setItems([this.drawingGraph]);
this.editor.sceneGraph.render();
this.editor.render();
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/tools/tool_select/tool_select.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class SelectTool implements ITool {

private handleHoverItemChange = () => {
if (!this.editor.toolManager.isDragging()) {
this.editor.sceneGraph.render();
this.editor.render();
}
};

Expand All @@ -70,7 +70,7 @@ export class SelectTool implements ITool {
);
this.editor.hostEventManager.off('spaceToggle', this.handleSpaceToggle);

this.editor.sceneGraph.render();
this.editor.render();
}

onMoveExcludeDrag(e: PointerEvent, isOutsideCanvas: boolean) {
Expand Down Expand Up @@ -195,7 +195,7 @@ export class SelectTool implements ITool {

if (this.topHitElementWhenStart && !this.isDragHappened) {
this.editor.selectedElements.toggleItems([this.topHitElementWhenStart]);
this.editor.sceneGraph.render();
this.editor.render();
}

const currStrategy = this.currStrategy;
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/tools/tool_select/tool_select_move.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export class SelectMoveTool implements IBaseTool {
});
}

this.editor.sceneGraph.render();
this.editor.render();
}
onEnd(e: PointerEvent, isDragHappened: boolean) {
const selectedItems = this.editor.selectedElements.getItems({
Expand Down Expand Up @@ -163,6 +163,6 @@ export class SelectMoveTool implements IBaseTool {
this.editor.sceneGraph.showBoxAndHandleWhenSelected = true;
this.editor.sceneGraph.showSelectedGraphsOutline = true;
this.editor.refLine.clear();
this.editor.sceneGraph.render();
this.editor.render();
}
}
4 changes: 2 additions & 2 deletions packages/core/src/tools/tool_select/tool_select_resize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export class SelectResizeTool implements IBaseTool {
}
}

this.editor.sceneGraph.render();
this.editor.render();
}
onEnd(_e: PointerEvent, isDragHappened: boolean) {
if (this.editor.selectedElements.size() === 0 || !isDragHappened) {
Expand All @@ -162,7 +162,7 @@ export class SelectResizeTool implements IBaseTool {
this.editor.controlHandleManager.setCustomHandles(
items[0].getControlHandles(this.editor.zoomManager.getZoom(), true),
);
this.editor.sceneGraph.render();
this.editor.render();
}
this.editor.commandManager.enableRedoUndo();
this.editor.hostEventManager.enableDelete();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class SelectRotationTool implements IBaseTool {
} else {
throw new Error('no selected elements, please report issue');
}
this.editor.sceneGraph.render();
this.editor.render();
}
onEnd() {
const selectedElements = this.editor.selectedElements.getItems();
Expand Down
Loading

0 comments on commit d0d52dd

Please sign in to comment.