Merge pull request #4416 from mP1/feature/SpreadsheetFormatterTableCo…

…mponent-implements-Value SpreadsheetFormatterTableComponent implements Value
mP1 · Jan 15, 2025 · b4c62c6 · b4c62c6
2 parents 135da5e + 852444b
commit b4c62c6
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 13 deletions.
diff --git a/...alkingkooka/spreadsheet/dominokit/format/SpreadsheetFormatterSelectorDialogComponent.java b/...alkingkooka/spreadsheet/dominokit/format/SpreadsheetFormatterSelectorDialogComponent.java
@@ -41,6 +41,7 @@
 import walkingkooka.spreadsheet.dominokit.selector.RemoveOrReplacePluginSelectorTokenComponent;
 import walkingkooka.spreadsheet.engine.SpreadsheetDelta;
 import walkingkooka.spreadsheet.format.SpreadsheetFormatterName;
+import walkingkooka.spreadsheet.format.SpreadsheetFormatterSample;
 import walkingkooka.spreadsheet.format.SpreadsheetFormatterSelector;
 import walkingkooka.spreadsheet.format.SpreadsheetFormatterSelectorToken;
 import walkingkooka.spreadsheet.format.SpreadsheetFormatterSelectorTokenAlternative;
@@ -50,6 +51,7 @@
 import walkingkooka.spreadsheet.server.formatter.SpreadsheetFormatterSelectorMenuList;
 import walkingkooka.text.CharSequences;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -264,11 +266,17 @@ private void onSpreadsheetFormatterSelectorEdit(final SpreadsheetFormatterSelect
         this.formatterName = edit.selector()
             .map(SpreadsheetFormatterSelector::name);
 
-        this.table.refresh(
-            edit.samples(),
-            context
+        final List<SpreadsheetFormatterSample> samples = edit.samples();
+        this.table.setValue(
+            Optional.ofNullable(
+                samples.isEmpty() ?
+                    null :
+                    samples
+            )
         );
 
+        this.table.refresh(context);
+
         final SpreadsheetFormatterSelectorAppendComponentPluginSelectorTokenComponentContextRemoveOrReplacePluginSelectorTokenComponentContext appenderRemoveOrReplaceContext =
             SpreadsheetFormatterSelectorAppendComponentPluginSelectorTokenComponentContextRemoveOrReplacePluginSelectorTokenComponentContext.with(
                 edit.selector()

diff --git a/...in/java/walkingkooka/spreadsheet/dominokit/format/SpreadsheetFormatterTableComponent.java b/...in/java/walkingkooka/spreadsheet/dominokit/format/SpreadsheetFormatterTableComponent.java
@@ -20,6 +20,7 @@
 import elemental2.dom.HTMLDivElement;
 import org.dominokit.domino.ui.datatable.CellTextAlign;
 import org.dominokit.domino.ui.datatable.ColumnConfig;
+import walkingkooka.Value;
 import walkingkooka.collect.list.Lists;
 import walkingkooka.spreadsheet.dominokit.card.SpreadsheetCard;
 import walkingkooka.spreadsheet.dominokit.datatable.SpreadsheetDataTableComponent;
@@ -36,7 +37,8 @@
 /**
  * A table that displays {@link walkingkooka.spreadsheet.format.SpreadsheetFormatterSample} with one per row.
  */
-public final class SpreadsheetFormatterTableComponent implements TableComponent<SpreadsheetFormatterTableComponent> {
+public final class SpreadsheetFormatterTableComponent implements TableComponent<SpreadsheetFormatterTableComponent>,
+    Value<Optional<List<SpreadsheetFormatterSample>>> {
 
     /**
      * Creates an empty {@link SpreadsheetFormatterTableComponent}.
@@ -98,17 +100,23 @@ private static ColumnConfig<SpreadsheetFormatterSample> columnConfig(final Strin
             );
     }
 
-    public void refresh(final List<SpreadsheetFormatterSample> samples,
-                        final SpreadsheetFormatterTableComponentContext context) {
-        Objects.requireNonNull(samples, "samples");
+    @Override
+    public Optional<List<SpreadsheetFormatterSample>> value() {
+        return this.samples;
+    }
+
+    public void setValue(final Optional<List<SpreadsheetFormatterSample>> samples) {
+        this.samples = Objects.requireNonNull(samples, "samples");
+    }
+
+    private Optional<List<SpreadsheetFormatterSample>> samples;
 
+    public void refresh(final SpreadsheetFormatterTableComponentContext context) {
         this.cellRenderer.context = Objects.requireNonNull(context, "context");
-        this.dataTable.setValue(
-            Optional.of(samples)
-        );
+        this.dataTable.setValue(this.samples);
 
         // manually show/hide depending on samples. Card will never be empty because SpreadsheetDataTableComponent is never empty
-        if (samples.isEmpty()) {
+        if (this.samples.isEmpty()) {
             this.card.hide();
         } else {
             this.card.show();

diff --git a/...a/walkingkooka/spreadsheet/dominokit/parser/SpreadsheetParserSelectorDialogComponent.java b/...a/walkingkooka/spreadsheet/dominokit/parser/SpreadsheetParserSelectorDialogComponent.java
@@ -41,6 +41,7 @@
 import walkingkooka.spreadsheet.dominokit.selector.AppendPluginSelectorTokenComponent;
 import walkingkooka.spreadsheet.dominokit.selector.RemoveOrReplacePluginSelectorTokenComponent;
 import walkingkooka.spreadsheet.engine.SpreadsheetDelta;
+import walkingkooka.spreadsheet.format.SpreadsheetFormatterSample;
 import walkingkooka.spreadsheet.format.pattern.SpreadsheetPatternKind;
 import walkingkooka.spreadsheet.meta.SpreadsheetMetadata;
 import walkingkooka.spreadsheet.parser.SpreadsheetParserName;
@@ -50,6 +51,7 @@
 import walkingkooka.spreadsheet.server.parser.SpreadsheetParserSelectorEdit;
 import walkingkooka.text.CharSequences;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -260,8 +262,15 @@ private void onSpreadsheetParserSelectorEdit(final SpreadsheetParserSelectorEdit
         this.parserName = edit.selector()
             .map(SpreadsheetParserSelector::name);
 
+        final List<SpreadsheetFormatterSample> samples = edit.samples();
+        this.table.setValue(
+            Optional.ofNullable(
+                samples.isEmpty() ?
+                    null :
+                    samples
+            )
+        );
         this.table.refresh(
-            edit.samples(),
             SpreadsheetParserSelectorDialogComponentSpreadsheetFormatterTableComponentContext.with(
                 edit.selector()
                     .orElse(null),

diff --git a/...ava/walkingkooka/spreadsheet/dominokit/format/SpreadsheetFormatterTableComponentTest.java b/...ava/walkingkooka/spreadsheet/dominokit/format/SpreadsheetFormatterTableComponentTest.java
@@ -29,6 +29,7 @@
 import walkingkooka.tree.text.TextNode;
 
 import java.util.List;
+import java.util.Optional;
 
 public final class SpreadsheetFormatterTableComponentTest implements TableComponentTesting<SpreadsheetFormatterTableComponent>,
     SpreadsheetMetadataTesting {
@@ -102,8 +103,16 @@ private void refreshAndCheck(final List<SpreadsheetFormatterSample> samples,
         final SpreadsheetFormatterTableComponent component = SpreadsheetFormatterTableComponent.empty(
             "id123-"
         );
+
+        component.setValue(
+            Optional.ofNullable(
+                samples.isEmpty() ?
+                    null :
+                    samples
+            )
+        );
+
         component.refresh(
-            samples,
             new FakeSpreadsheetFormatterTableComponentContext() {
                 @Override
                 public HistoryToken historyToken() {