Skip to content
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.

Sign up for GitHub

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

Jump to bottom

#2186 Expression Builder: Operation symbols and add field buttons cannot add at the beginning of expression #2187

Merged
merged 6 commits into from
Oct 9, 2024
Merged

#2186 Expression Builder: Operation symbols and add field buttons cannot add at the beginning of expression #2187

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e6a98e
Changed if statement to fix bug
Sep 26, 2024
4d345e2
Merge branch 'main' into expression-builder-beginning
mikieyx Oct 2, 2024
81e7a50
Merge branch 'main' into expression-builder-beginning
mikieyx Oct 4, 2024
691a3fc
Merge branch 'main' into expression-builder-beginning
mikieyx Oct 8, 2024
6422bdb
removing unnecessary comment
Oct 9, 2024
0a7021b
Merge branch 'expression-builder-beginning' of github.com:mikieyx/can…
Oct 9, 2024
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
2 changes: 1 addition & 1 deletion ...anvas/src/common-properties/controls/expression/expression-builder/expression-builder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default class ExpressionBuilder extends React.Component {
const value = (typeof newValue === "string") ? newValue : newValue.toString();
const somethingSelected = this.getCodemirrorState()?.selection.ranges.some((r) => !r.empty);
let cursor = this.getCodemirrorState()?.selection.main.head;
if (cursor === 0 && !somethingSelected) { // TODO: Doesn't work when I explicitly set the cursor to 0
if (isNaN(cursor) && !somethingSelected) { // TODO: Doesn't work when I explicitly set the cursor to 0
Copy link
Member

@matthoward366 matthoward366 Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the TODO be removed? Also, is there a case where cursor === 0? Wonder if this should (isNaN(cursor) || cursor === 0) ...

Copy link
Contributor Author

@mikieyx mikieyx Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look into it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I switch the condition to (isNan(cursor) || cursor === 0) , the bug is still present. I'm not to sure about the comment, I can remove if need be.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should remove it since I don't know why it would be needed anymore.

// When nothing selected, set cursor at the end of the line
this.editor.dispatch({ selection: { anchor: this.getCodemirrorState()?.doc.length } });
cursor = this.getCodemirrorState()?.selection.main.head;
Expand Down