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

#2122 Expression builder - After expression validation, chars need to be entered twice to reflect #2123

Merged
merged 14 commits into from
Oct 14, 2024
Merged

#2122 Expression builder - After expression validation, chars need to be entered twice to reflect #2123

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a1410a5
Fixed expression char bug
Aug 27, 2024
b98b423
Merge branch 'main' of https://github.com/elyra-ai/canvas into expres…
Sep 23, 2024
4851d2f
fixed the bug where you couldn't save work from expression builder
Oct 3, 2024
dd54411
Merge branch 'main' into expression-builder-chars
mikieyx Oct 3, 2024
44f6580
removed unnecessary log statement
Oct 3, 2024
13f5c36
Merge branch 'expression-builder-chars' of github.com:mikieyx/canvas …
Oct 3, 2024
a53a14f
Merge branch 'main' into expression-builder-chars
mikieyx Oct 4, 2024
44366a2
Merge branch 'main' into expression-builder-chars
matthoward366 Oct 7, 2024
7fab252
Merge branch 'main' into expression-builder-chars
mikieyx Oct 8, 2024
c698fb0
Removing focus, fixing glitch
Oct 8, 2024
0c78336
Merge branch 'expression-builder-chars' of github.com:mikieyx/canvas …
Oct 8, 2024
a49d4e4
Merge branch 'main' into expression-builder-chars
mikieyx Oct 9, 2024
82ffc94
Merge branch 'main' into expression-builder-chars
mikieyx Oct 10, 2024
e31ed54
Merge branch 'main' into expression-builder-chars
matthoward366 Oct 14, 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
12 changes: 10 additions & 2 deletions canvas_modules/common-canvas/src/common-properties/controls/expression/expression.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,16 @@ class ExpressionControl extends React.Component {
});
this.editor.focus();
}
if (!isEqual(this.getCodemirrorState()?.doc.toString(), this.props.value)) {
this.editor.dispatch({ changes: { from: 0, to: this.getCodemirrorState()?.doc?.length, insert: this.props.value } });
if (!isEqual(prevProps.value, this.props.value)) {
const selection = this.editor.state.selection.main;
this.editor.dispatch({
changes: {
from: 0,
to: this.getCodemirrorState()?.doc?.length,
insert: this.props.value },
selection: {
anchor: selection.anchor,
head: selection.head } });
}
}

Expand Down