@odoo/o-spreadsheet 17.3.0-alpha.2 → 17.3.0-alpha.3

package/dist/o_spreadsheet.xml

@@ -1,9 +1,9 @@
 <!--
  This file is generated by o-spreadsheet build tools. Do not edit it.
  @see https://github.com/odoo/o-spreadsheet
- @version 17.3.0-alpha.2
- @date 2024-04-05T14:01:48.832Z
- @hash 8c5a229
+ @version 17.3.0-alpha.3
+ @date 2024-04-10T12:29:04.461Z
+ @hash 80b5056
 -->
 <odoo>
   <t t-name="o-spreadsheet-ActionButton">
@@ -471,6 +471,7 @@
         t-on-compositionstart="onCompositionStart"
         t-on-compositionend="onCompositionEnd"
         t-on-dblclick="onDblClick"
+        t-on-contextmenu="onContextMenu"
       />
 
       <div
@@ -574,7 +575,12 @@
       class="o-topbar-composer bg-white user-select-text"
       t-on-click.stop=""
       t-att-style="containerStyle">
-      <Composer focus="focus" inputStyle="composerStyle" onComposerContentFocused.bind="onFocus"/>
+      <Composer
+        focus="focus"
+        inputStyle="composerStyle"
+        onComposerContentFocused.bind="onFocus"
+        delimitation="delimitation"
+      />
     </div>
   </t>
 
@@ -583,7 +589,7 @@
       class="o-grid o-two-columns"
       tabindex="-1"
       t-on-wheel="onMouseWheel"
-      t-on-click="onClosePopover">
+      t-on-pointerdown="onClosePopover">
       <div class="mx-auto h-100 position-relative" t-ref="grid" t-att-style="gridContainer">
         <GridOverlay
           onCellHovered.bind="onCellHovered"
@@ -606,7 +612,6 @@
           t-on-contextmenu.prevent=""
           t-att-style="getCellClickableStyle(clickableCell.coordinates)"
         />
-        <FilterIconsOverlay/>
       </div>
       <VerticalScrollBar/>
       <HorizontalScrollBar/>
@@ -806,21 +811,23 @@
   </t>
 
   <t t-name="o-spreadsheet-FilterIcon">
-    <div class="o-filter-icon" t-att-class="iconClass" t-on-click.stop="onClick">
+    <div class="o-filter-icon" t-att-class="iconClass" t-on-click="onClick">
       <t t-if="isFilterActive" t-call="o-spreadsheet-Icon.FILTER_ICON_ACTIVE"/>
       <t t-else="" t-call="o-spreadsheet-Icon.FILTER_ICON"/>
     </div>
   </t>
 
   <t t-name="o-spreadsheet-FilterIconsOverlay">
-    <t
-      t-foreach="getFilterHeadersPositions()"
-      t-as="position"
-      t-key="'filter'+position.col + '_' + position.row">
-      <GridCellIcon cellPosition="position" offset="props.gridPosition" horizontalAlign="'right'">
-        <FilterIcon cellPosition="position"/>
-      </GridCellIcon>
-    </t>
+    <div t-on-pointerdown.stop="this.props.onMouseDown">
+      <t
+        t-foreach="getFilterHeadersPositions()"
+        t-as="position"
+        t-key="'filter'+position.col + '_' + position.row">
+        <GridCellIcon cellPosition="position" horizontalAlign="'right'">
+          <FilterIcon cellPosition="position"/>
+        </GridCellIcon>
+      </t>
+    </div>
   </t>
 
   <t t-name="o-spreadsheet-FilterMenu">
@@ -948,7 +955,6 @@
       t-on-click="focusDefaultElement"
       t-on-keydown="onKeydown"
       t-on-wheel="onMouseWheel"
-      t-on-contextmenu="onInputContextMenu"
       t-ref="grid">
       <GridOverlay
         onCellClicked.bind="onCellClicked"
@@ -961,7 +967,10 @@
         onFigureDeleted.bind="focusDefaultElement"
       />
       <HeadersOverlay onOpenContextMenu="(type, x, y) => this.toggleContextMenu(type, x, y)"/>
-      <GridComposer gridDims="env.model.getters.getSheetViewDimensionWithHeaders()"/>
+      <GridComposer
+        gridDims="env.model.getters.getSheetViewDimensionWithHeaders()"
+        onInputContextMenu.bind="onInputContextMenu"
+      />
       <canvas t-ref="canvas"/>
       <t
         t-foreach="env.model.getters.getClientsToDisplay()"
@@ -996,7 +1005,6 @@
         position="menuState.position"
         onClose="() => this.closeMenu()"
       />
-      <FilterIconsOverlay gridPosition="{ x: HEADER_WIDTH, y : HEADER_HEIGHT }"/>
       <VerticalScrollBar topOffset="HEADER_HEIGHT"/>
       <HorizontalScrollBar leftOffset="HEADER_WIDTH"/>
       <div class="o-scrollbar corner"/>
@@ -1049,6 +1057,7 @@
       t-on-contextmenu.stop.prevent="onContextMenu">
       <FiguresContainer onFigureDeleted="props.onFigureDeleted"/>
       <DataValidationOverlay/>
+      <FilterIconsOverlay onMouseDown="(ev) => this.onMouseDown(ev, {closePopover: false})"/>
       <GridAddRowsFooter
         t-if="!env.model.getters.isReadonly()"
         t-key="env.model.getters.getActiveSheetId()"
@@ -2610,10 +2619,17 @@ https://fontawesome.com/license -->
 
   <t t-name="o-spreadsheet-BarChartDesignPanel">
     <div>
-      <ChartColor
-        currentColor="props.definition.background"
-        onColorPicked.bind="updateBackgroundColor"
-      />
+      <Section class="'o-chart-background-color'">
+        <t t-set-slot="title">Background color</t>
+        <div class="d-flex align-items-center">
+          <span class="me-2">Select a color...</span>
+          <RoundColorPicker
+            currentColor="props.definition.background"
+            onColorPicked.bind="updateBackgroundColor"
+            title="backgroundColorTitle"
+          />
+        </div>
+      </Section>
       <ChartTitle title="title" update.bind="updateTitle"/>
       <Section>
         <t t-set-slot="title">Vertical axis position</t>
@@ -2641,24 +2657,6 @@ https://fontawesome.com/license -->
     </div>
   </t>
 
-  <t t-name="o-spreadsheet.ChartColor">
-    <Section class="'o-chart-background-color'">
-      <t t-set-slot="title">Background color</t>
-      <div class="d-flex align-items-center">
-        <span class="pe-1">Select a color...</span>
-        <t t-set="background_color">Background color</t>
-        <ColorPickerWidget
-          currentColor="props.currentColor"
-          showColorPicker="state.pickerOpened"
-          toggleColorPicker.bind="togglePicker"
-          onColorPicked="props.onColorPicked"
-          title="background_color"
-          icon="'o-spreadsheet-Icon.FILL_COLOR'"
-        />
-      </div>
-    </Section>
-  </t>
-
   <t t-name="o-spreadsheet.ChartDataSeries">
     <Section class="'o-data-series'">
       <t t-set-slot="title" t-esc="title"/>
@@ -2751,10 +2749,17 @@ https://fontawesome.com/license -->
 
   <t t-name="o-spreadsheet-ComboChartDesignPanel">
     <div>
-      <ChartColor
-        currentColor="props.definition.background"
-        onColorPicked.bind="updateBackgroundColor"
-      />
+      <Section class="'o-chart-background-color'">
+        <t t-set-slot="title">Background color</t>
+        <div class="d-flex align-items-center">
+          <span class="me-2">Select a color...</span>
+          <RoundColorPicker
+            currentColor="props.definition.background"
+            onColorPicked.bind="updateBackgroundColor"
+            title="backgroundColorTitle"
+          />
+        </div>
+      </Section>
       <ChartTitle title="title" update.bind="updateTitle"/>
       <Section t-if="!props.definition.useBothYAxis">
         <t t-set-slot="title">Vertical axis position</t>
@@ -2800,10 +2805,17 @@ https://fontawesome.com/license -->
 
   <t t-name="o-spreadsheet-GaugeChartDesignPanel">
     <div>
-      <ChartColor
-        currentColor="props.definition.background"
-        onColorPicked.bind="updateBackgroundColor"
-      />
+      <Section class="'o-chart-background-color'">
+        <t t-set-slot="title">Background color</t>
+        <div class="d-flex align-items-center">
+          <span class="me-2">Select a color...</span>
+          <RoundColorPicker
+            currentColor="props.definition.background"
+            onColorPicked.bind="updateBackgroundColor"
+            title="backgroundColorTitle"
+          />
+        </div>
+      </Section>
       <ChartTitle title="title" update.bind="updateTitle"/>
       <Section>
         <t t-set-slot="title">Range</t>
@@ -2868,12 +2880,9 @@ https://fontawesome.com/license -->
 
         <tr>
           <td>
-            <ColorPickerWidget
+            <RoundColorPicker
               currentColor="sectionRule.colors.upperColor"
-              toggleColorPicker="(ev) => this.toggleMenu('sectionColor-upperColor', ev)"
-              showColorPicker="state.openedMenu === 'sectionColor-upperColor'"
               onColorPicked="(color) => this.updateSectionColor('upperColor', color)"
-              icon="'o-spreadsheet-Icon.FILL_COLOR'"
             />
           </td>
           <td>Else</td>
@@ -2888,12 +2897,9 @@ https://fontawesome.com/license -->
   <t t-name="o-spreadsheet-GaugeChartColorSectionTemplateRow">
     <tr>
       <td>
-        <ColorPickerWidget
+        <RoundColorPicker
           currentColor="sectionColor"
-          toggleColorPicker="(ev) => this.toggleMenu('sectionColor-'+sectionType, ev)"
-          showColorPicker="state.openedMenu === 'sectionColor-'+sectionType"
           onColorPicked="(color) => this.updateSectionColor(sectionType, color)"
-          icon="'o-spreadsheet-Icon.FILL_COLOR'"
         />
       </td>
       <td>When value is below</td>
@@ -2950,10 +2956,17 @@ https://fontawesome.com/license -->
 
   <t t-name="o-spreadsheet-LineBarPieDesignPanel">
     <div>
-      <ChartColor
-        currentColor="props.definition.background"
-        onColorPicked.bind="updateBackgroundColor"
-      />
+      <Section class="'o-chart-background-color'">
+        <t t-set-slot="title">Background color</t>
+        <div class="d-flex align-items-center">
+          <span class="me-2">Select a color...</span>
+          <RoundColorPicker
+            currentColor="props.definition.background"
+            onColorPicked.bind="updateBackgroundColor"
+            title="backgroundColorTitle"
+          />
+        </div>
+      </Section>
       <ChartTitle title="title" update.bind="updateTitle"/>
       <Section>
         <t t-set-slot="title">Legend position</t>
@@ -3014,10 +3027,17 @@ https://fontawesome.com/license -->
 
   <t t-name="o-spreadsheet-LineChartDesignPanel">
     <div>
-      <ChartColor
-        currentColor="props.definition.background"
-        onColorPicked.bind="updateBackgroundColor"
-      />
+      <Section class="'o-chart-background-color'">
+        <t t-set-slot="title">Background color</t>
+        <div class="d-flex align-items-center">
+          <span class="me-2">Select a color...</span>
+          <RoundColorPicker
+            currentColor="props.definition.background"
+            onColorPicked.bind="updateBackgroundColor"
+            title="backgroundColorTitle"
+          />
+        </div>
+      </Section>
       <ChartTitle title="title" update.bind="updateTitle"/>
       <Section>
         <t t-set-slot="title">Vertical axis position</t>
@@ -3163,6 +3183,7 @@ https://fontawesome.com/license -->
           <option value="text">Absolute value</option>
           <option value="difference">Value change from key value</option>
           <option value="percentage">Percentage change from key value</option>
+          <option value="progress">Progress bar</option>
         </select>
       </Section>
 
@@ -3174,10 +3195,17 @@ https://fontawesome.com/license -->
     <t t-set="color_up">Color Up</t>
     <t t-set="color_down">Color Down</t>
     <div>
-      <ChartColor
-        currentColor="props.definition.background"
-        onColorPicked="(color) => this.setColor(color, 'backgroundColor')"
-      />
+      <Section class="'o-chart-background-color'">
+        <t t-set-slot="title">Background color</t>
+        <div class="d-flex align-items-center">
+          <span class="me-2">Select a color...</span>
+          <RoundColorPicker
+            currentColor="props.definition.background"
+            onColorPicked="(color) => this.setColor(color, 'backgroundColor')"
+            title="backgroundColorTitle"
+          />
+        </div>
+      </Section>
       <ChartTitle title="title" update.bind="updateTitle"/>
       <Section>
         <t t-set-slot="title">Baseline description</t>
@@ -3190,30 +3218,33 @@ https://fontawesome.com/license -->
       </Section>
     </div>
     <Section class="'o-chart-baseline-color'">
-      <t t-set-slot="title">Baseline color</t>
-      <div class="d-flex align-items-center">
-        <span class="pe-1">Color on value increase</span>
-        <ColorPickerWidget
+      <t t-set-slot="title" t-esc="colorsSectionTitle"/>
+      <div class="d-flex align-items-center mb-2">
+        <RoundColorPicker
           currentColor="props.definition.baselineColorUp"
-          toggleColorPicker="() => this.toggleColorPicker('baselineColorUp')"
-          showColorPicker="state.openedColorPicker === 'baselineColorUp'"
           onColorPicked="(color) => this.setColor(color, 'baselineColorUp')"
           title="color_up"
-          icon="'o-spreadsheet-Icon.FILL_COLOR'"
         />
+        <span class="ps-2">Color on value increase</span>
       </div>
       <div class="d-flex align-items-center">
-        <span class="pe-1">Color on value decrease</span>
-        <ColorPickerWidget
+        <RoundColorPicker
           currentColor="props.definition.baselineColorDown"
-          toggleColorPicker="() => this.toggleColorPicker('baselineColorDown')"
-          showColorPicker="state.openedColorPicker === 'baselineColorDown'"
           onColorPicked="(color) => this.setColor(color, 'baselineColorDown')"
           title="color_down"
-          icon="'o-spreadsheet-Icon.FILL_COLOR'"
         />
+        <span class="ps-2">Color on value decrease</span>
       </div>
     </Section>
+    <Section class="'pt-1'">
+      <t t-set-slot="title">Number formatting</t>
+      <Checkbox
+        name="'humanizeNumbers'"
+        label="humanizeNumbersLabel"
+        value="props.definition.humanize"
+        onChange.bind="updateHumanizeNumbers"
+      />
+    </Section>
   </t>
 
   <t t-name="o-spreadsheet.Checkbox">
@@ -3234,6 +3265,22 @@ https://fontawesome.com/license -->
     </label>
   </t>
 
+  <t t-name="o-spreadsheet.RoundColorPicker">
+    <div
+      class="o-round-color-picker-button rounded-circle"
+      t-ref="colorPickerButton"
+      t-on-click.stop="togglePicker"
+      t-att-title="props.title"
+      t-att-style="buttonStyle"
+    />
+    <ColorPicker
+      t-if="state.pickerOpened"
+      anchorRect="colorPickerAnchorRect"
+      onColorPicked.bind="onColorPicked"
+      currentColor="props.currentColor"
+    />
+  </t>
+
   <t t-name="o_spreadsheet.Section">
     <div class="o-section" t-att-class="props.class">
       <t t-if="props.slots.title">
@@ -3468,19 +3515,22 @@ https://fontawesome.com/license -->
         type="text"
         class="o-input o-threshold-value o-required"
         t-model="rule[thresholdType].value"
-        t-att-class="{ 'o-invalid': isValueInvalid(thresholdType) }"
+        t-att-class="{ 'o-invalid': isValueInvalid(thresholdType), 'invisible': threshold === undefined }"
         t-if="threshold !== undefined and threshold.type !== 'value'"
       />
-      <input type="text" class="o-input o-threshold-value" t-else="" disabled="1"/>
-      <ColorPickerWidget
-        currentColor="getThresholdColor(threshold)"
-        toggleColorPicker="(ev) => this.toggleMenu('colorScale-'+thresholdType+'Color', ev)"
-        showColorPicker="state.openedMenu === 'colorScale-'+thresholdType+'Color'"
-        onColorPicked="(color) => this.setColorScaleColor(thresholdType, color)"
-        title="fill_color"
-        icon="'o-spreadsheet-Icon.FILL_COLOR'"
-        disabled="threshold === undefined"
+      <input
+        type="text"
+        t-attf-class="o-input o-threshold-value {{ threshold === undefined ? 'invisible' : ''}}"
+        t-else=""
+        disabled="1"
       />
+      <div t-attf-class="flex-shrink-0 ms-1 {{ threshold === undefined ? 'invisible' : ''}}">
+        <RoundColorPicker
+          currentColor="getThresholdColor(threshold)"
+          onColorPicked="(color) => this.setColorScaleColor(thresholdType, color)"
+          title="fill_color"
+        />
+      </div>
     </div>
   </t>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odoo/o-spreadsheet",
-  "version": "17.3.0-alpha.2",
+  "version": "17.3.0-alpha.3",
   "description": "A spreadsheet component",
   "type": "module",
   "main": "dist/o-spreadsheet.cjs.js",