This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 47835aea4ca NO-ISSUE: Fixes iterator expressions and nested iterator
expressions on the DMN Editor (#2248)
47835aea4ca is described below
commit 47835aea4cabb8004e4f2aadea62bbe656fa1f54
Author: Daniel José dos Santos <[email protected]>
AuthorDate: Thu Apr 18 17:50:46 2024 -0300
NO-ISSUE: Fixes iterator expressions and nested iterator expressions on the
DMN Editor (#2248)
---
.../IteratorExpressionComponent.tsx | 2 +-
.../src/resizing/WidthMaths.ts | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git
a/packages/boxed-expression-component/src/expressions/IteratorExpression/IteratorExpressionComponent.tsx
b/packages/boxed-expression-component/src/expressions/IteratorExpression/IteratorExpressionComponent.tsx
index 86d118fe2a6..d56b1d51780 100644
---
a/packages/boxed-expression-component/src/expressions/IteratorExpression/IteratorExpressionComponent.tsx
+++
b/packages/boxed-expression-component/src/expressions/IteratorExpression/IteratorExpressionComponent.tsx
@@ -219,7 +219,7 @@ export function IteratorExpressionComponent({
/>
</div>
);
- } else if (props.rowIndex === 2 || props.rowIndex === 3) {
+ } else if (props.rowIndex === 1 || props.rowIndex === 2) {
return (
<IteratorExpressionCell
iteratorClause={props.data[props.rowIndex]}
diff --git a/packages/boxed-expression-component/src/resizing/WidthMaths.ts
b/packages/boxed-expression-component/src/resizing/WidthMaths.ts
index f18fbe11080..3b3f3e5003f 100644
--- a/packages/boxed-expression-component/src/resizing/WidthMaths.ts
+++ b/packages/boxed-expression-component/src/resizing/WidthMaths.ts
@@ -148,6 +148,25 @@ export function getExpressionMinWidth(expression?:
BoxedExpression): number {
);
}
+ // For
+ else if (expression.__$$element === "for") {
+ const nestedExpressions = [expression.in.expression,
expression.return.expression];
+ return (
+ ITERATOR_EXPRESSION_LABEL_COLUMN_WIDTH +
+ Math.max(ITERATOR_EXPRESSION_CLAUSE_COLUMN_MIN_WIDTH,
...nestedExpressions.map((e) => getExpressionMinWidth(e))) +
+ ITERATOR_EXPRESSION_EXTRA_WIDTH
+ );
+ }
+
+ // Every/Some
+ else if (expression.__$$element === "every" || expression.__$$element ===
"some") {
+ const nestedExpressions = [expression.in.expression,
expression.satisfies.expression];
+ return (
+ ITERATOR_EXPRESSION_LABEL_COLUMN_WIDTH +
+ Math.max(ITERATOR_EXPRESSION_CLAUSE_COLUMN_MIN_WIDTH,
...nestedExpressions.map((e) => getExpressionMinWidth(e))) +
+ ITERATOR_EXPRESSION_EXTRA_WIDTH
+ );
+ }
// Others
else {
throw new Error("Shouldn't ever reach this point");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
