Skip to content

Commit

Permalink
Merge branch 'feature/refactor-deep-partial-type' of https://github.c…
Browse files Browse the repository at this point in the history
…om/ls1intum/Apollon into feature/refactor-deep-partial-type
  • Loading branch information
matthiaslehnertum committed May 9, 2024
2 parents 912e284 + c60b316 commit 724bf60
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Sphinx==6.2.1
sphinx-rtd-theme==1.2.2
Jinja2==3.1.3
Jinja2==3.1.4
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ls1intum/apollon",
"version": "3.3.13",
"version": "3.3.14",
"description": "A UML diagram editor.",
"keywords": [],
"homepage": "https://github.com/ls1intum/apollon#readme",
Expand Down
5 changes: 4 additions & 1 deletion src/main/components/uml-element/canvas-element.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type StateProps = {
interactable: boolean;
element: IUMLElement;
zoomFactor: number;
selectionBoxActive: boolean;
};

type DispatchProps = {};
Expand All @@ -44,6 +45,7 @@ const enhance = compose<ComponentClass<OwnProps>>(
interactable: state.editor.view === ApollonView.Exporting || state.editor.view === ApollonView.Highlight,
element: state.elements[props.id],
zoomFactor: state.editor.zoomFactor,
selectionBoxActive: state.editor.selectionBoxActive,
}),
{},
),
Expand All @@ -62,7 +64,8 @@ class CanvasElementComponent extends Component<Props> {
child: ChildComponent,
children,
theme,
zoomFactor: _,
zoomFactor: _zoomFactor,
selectionBoxActive: _selectionBoxActive,
...props
} = this.props;

Expand Down

0 comments on commit 724bf60

Please sign in to comment.