Skip to content

Commit 224577b

Browse files
vegegokuvegegoku
committed
fix #1026 Console Debug left in menu/RightDropDownDirection.jav
1 parent 39a31ed commit 224577b

20 files changed

+31
-121
lines changed

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BestFitSideDropDirection.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.dominokit.domino.ui.menu.direction;
1717

1818
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
19-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2019

2120
import elemental2.dom.Element;
2221

@@ -46,12 +45,7 @@ public DropDirection position(DropDirectionContext context) {
4645
}
4746
}
4847

49-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
50-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
51-
52-
context.newSpaceChecker();
53-
54-
return position(context);
48+
return fallBackPosition(context, spaceChecker);
5549
}
5650

5751
/** {@inheritDoc} */

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BestMiddleDownUpDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.dominokit.domino.ui.menu.direction;
1717

1818
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
19-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2019

2120
import elemental2.dom.Element;
2221

@@ -38,11 +37,7 @@ public DropDirection position(DropDirectionContext context) {
3837
} else if (spaceChecker.hasSpaceAbove()) {
3938
return TOP_MIDDLE.position(context);
4039
} else {
41-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
42-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
43-
context.newSpaceChecker();
44-
45-
return position(context);
40+
return fallBackPosition(context, spaceChecker);
4641
}
4742
}
4843

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BestMiddleSideDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.dominokit.domino.ui.menu.direction;
1717

1818
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
19-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2019

2120
import elemental2.dom.Element;
2221

@@ -36,11 +35,7 @@ public DropDirection position(DropDirectionContext context) {
3635
} else if (spaceChecker.hasSpaceOnLeft()) {
3736
return LEFT_MIDDLE.position(context);
3837
} else {
39-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
40-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
41-
context.newSpaceChecker();
42-
43-
return position(context);
38+
return fallBackPosition(context, spaceChecker);
4439
}
4540
}
4641

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BestMiddleUpDownDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.dominokit.domino.ui.menu.direction;
1717

1818
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
19-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2019

2120
import elemental2.dom.Element;
2221

@@ -37,11 +36,7 @@ public DropDirection position(DropDirectionContext context) {
3736
} else if (spaceChecker.hasSpaceBelow()) {
3837
return BOTTOM_MIDDLE.position(context);
3938
} else {
40-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
41-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
42-
context.newSpaceChecker();
43-
44-
return position(context);
39+
return fallBackPosition(context, spaceChecker);
4540
}
4641
}
4742

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BestSideUpDownDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.dominokit.domino.ui.menu.direction;
1717

1818
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
19-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2019

2120
import elemental2.dom.Element;
2221

@@ -45,11 +44,7 @@ public DropDirection position(DropDirectionContext context) {
4544
}
4645
}
4746

48-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
49-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
50-
context.newSpaceChecker();
51-
52-
return position(context);
47+
return fallBackPosition(context, spaceChecker);
5348
}
5449

5550
/** {@inheritDoc} */

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BottomLeftDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static elemental2.dom.DomGlobal.window;
1919
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
20-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2120
import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
2221
import static org.dominokit.domino.ui.utils.Unit.px;
2322

@@ -77,11 +76,7 @@ public DropDirection position(DropDirectionContext context) {
7776
} else if (spaceChecker.hasSpaceAbove()) {
7877
return TOP_MIDDLE.position(context);
7978
} else {
80-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
81-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
82-
context.newSpaceChecker();
83-
84-
return position(context);
79+
return fallBackPosition(context, spaceChecker);
8580
}
8681
}
8782

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BottomMiddleDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static elemental2.dom.DomGlobal.window;
1919
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
20-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2120
import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
2221
import static org.dominokit.domino.ui.utils.Unit.px;
2322

@@ -52,11 +51,7 @@ public DropDirection position(DropDirectionContext context) {
5251
return TOP_MIDDLE.position(context);
5352
}
5453
}
55-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
56-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
57-
context.newSpaceChecker();
58-
59-
return position(context);
54+
return fallBackPosition(context, spaceChecker);
6055
}
6156

6257
private DropDirection showBelowMiddle(Element source, SpaceChecker spaceChecker) {

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/BottomRightDropDirection.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import static elemental2.dom.DomGlobal.window;
1919
import static org.dominokit.domino.ui.style.SpacingCss.dui_flex_col_reverse;
20-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2120
import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
2221
import static org.dominokit.domino.ui.utils.Unit.px;
2322

@@ -76,11 +75,7 @@ public DropDirection position(DropDirectionContext context) {
7675
} else if (spaceChecker.hasSpaceAbove()) {
7776
return TOP_MIDDLE.position(context);
7877
} else {
79-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
80-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
81-
context.newSpaceChecker();
82-
83-
return position(context);
78+
return fallBackPosition(context, spaceChecker);
8479
}
8580
}
8681

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/DropDirection.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package org.dominokit.domino.ui.menu.direction;
1717

18+
import static org.dominokit.domino.ui.utils.Domino.elementOf;
19+
1820
import elemental2.dom.Element;
1921
import elemental2.dom.Event;
2022
import org.dominokit.domino.ui.style.CssClass;
@@ -39,14 +41,23 @@ default DropDirection init(Event event) {
3941
DropDirection position(DropDirectionContext context);
4042

4143
/**
42-
* cleanup.
44+
* cleanup.F
4345
*
4446
* @param source a {@link elemental2.dom.Element} object
4547
*/
4648
default void cleanup(Element source) {}
4749

4850
default void cleanSelf(Element source) {}
4951

52+
default DropDirection fallBackPosition(DropDirectionContext context, SpaceChecker spaceChecker) {
53+
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
54+
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
55+
56+
context.newSpaceChecker();
57+
58+
return position(context);
59+
}
60+
5061
/** Constant <code>BEST_FIT_SIDE</code> */
5162
DropDirection BEST_FIT_SIDE = new BestFitSideDropDirection();
5263
/** Constant <code>BEST_MIDDLE_SIDE</code> */

‎domino-ui/src/main/java/org/dominokit/domino/ui/menu/direction/LeftDownDropDirection.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.dominokit.domino.ui.menu.direction;
1717

1818
import static elemental2.dom.DomGlobal.window;
19-
import static org.dominokit.domino.ui.utils.Domino.elementOf;
2019
import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
2120
import static org.dominokit.domino.ui.utils.Unit.px;
2221

@@ -66,12 +65,7 @@ public DropDirection position(DropDirectionContext context) {
6665
} else if (spaceChecker.hasSpaceAbove()) {
6766
return LEFT_UP.position(context);
6867
} else {
69-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
70-
elementOf(context.getSource())
71-
.setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
72-
context.newSpaceChecker();
73-
74-
return position(context);
68+
return fallBackPosition(context, spaceChecker);
7569
}
7670
} else if (spaceChecker.hasSpaceOnRight()) {
7771
return RIGHT_DOWN.position(context);
@@ -81,11 +75,7 @@ public DropDirection position(DropDirectionContext context) {
8175
return TOP_MIDDLE.position(context);
8276
}
8377

84-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumSideSpaceProperty());
85-
elementOf(context.getSource()).setCssProperty(spaceChecker.getMaximumVerticalSpaceProperty());
86-
context.newSpaceChecker();
87-
88-
return position(context);
78+
return fallBackPosition(context, spaceChecker);
8979
}
9080

9181
/** {@inheritDoc} */

0 commit comments

Comments
 (0)