From 55e08f2269394c87bd36cacd49ddf39a5e491d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Rahir=20=28rar=29?= Date: Wed, 30 Aug 2023 10:46:09 +0200 Subject: [PATCH] [IMP] spreadsheet: update o_spreadsheet to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Contains the following commits: https://github.com/odoo/o-spreadsheet/commit/7be84185 [REL] 16.5.0-alpha.6 https://github.com/odoo/o-spreadsheet/commit/3523c12b [IMP] bundle: raise if owl="1" found Task: / https://github.com/odoo/o-spreadsheet/commit/148984ec [IMP] translation: accept number placeholder value Task: / https://github.com/odoo/o-spreadsheet/commit/c67ed02b [REV] components: prevent mouse event defaults on drag-and-drop https://github.com/odoo/o-spreadsheet/commit/fd4bb28f [IMP] package: update Typescript to version 5.1 https://github.com/odoo/o-spreadsheet/commit/a9162e9d [IMP] package: update rollup to version 3 https://github.com/odoo/o-spreadsheet/commit/3a49640b [IMP] package: convert to ES module https://github.com/odoo/o-spreadsheet/commit/88815a2f [REF] o-spreadsheet: remove owl="1" from the templates Task: 3470126 https://github.com/odoo/o-spreadsheet/commit/3fbf77d4 [FIX] Menu: Hide the icon slot of the menu items when absent Task: 3476424 https://github.com/odoo/o-spreadsheet/commit/49e6f84d [FIX] LineChart: Do not store window.Chart at top level Task: 3476486 https://github.com/odoo/o-spreadsheet/commit/8f9cbdd5 [FIX] demo: console error messages https://github.com/odoo/o-spreadsheet/commit/24ca9397 [REF] functions: simplify arguments types using type Maybe https://github.com/odoo/o-spreadsheet/commit/c3facade [IMP] index: export helpers to build menus https://github.com/odoo/o-spreadsheet/commit/781b3e8d [IMP] Spreadsheet: prevent change of props model https://github.com/odoo/o-spreadsheet/commit/96078972 [REF] module_database: remove useless map https://github.com/odoo/o-spreadsheet/commit/f6dcb7f8 [REM] test: remove interactive env helper closes odoo/odoo#133576 Signed-off-by: Lucas Lefèvre (lul) --- .../static/src/o_spreadsheet/o_spreadsheet.js | 291 ++++++------- .../src/o_spreadsheet/o_spreadsheet.xml | 382 +++++++++--------- 2 files changed, 339 insertions(+), 334 deletions(-) diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js index 948148f4a90..644bac7907f 100644 --- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js +++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js @@ -293,6 +293,8 @@ const NEWLINE = "\n"; const FONT_SIZES = [6, 7, 8, 9, 10, 11, 12, 14, 18, 24, 36]; + //------------------------------------------------------------------------------ + // Miscellaneous //------------------------------------------------------------------------------ /** * Stringify an object, like JSON.stringify, except that the first level of keys @@ -1155,6 +1157,8 @@ String(row + 1)); } + // ----------------------------------------------------------------------------- + // Date Type // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- // Parsing @@ -3424,6 +3428,39 @@ } } + function createActions(menuItems) { + return menuItems.map(createAction).sort((a, b) => a.sequence - b.sequence); + } + const uuidGenerator$2 = new UuidGenerator(); + function createAction(item) { + const name = item.name; + const children = item.children; + const description = item.description; + const icon = item.icon; + return { + id: item.id || uuidGenerator$2.uuidv4(), + name: typeof name === "function" ? name : () => name, + isVisible: item.isVisible ? item.isVisible : () => true, + isEnabled: item.isEnabled ? item.isEnabled : () => true, + isActive: item.isActive, + execute: item.execute, + children: children + ? (env) => { + return children + .map((child) => (typeof child === "function" ? child(env) : child)) + .flat() + .map(createAction); + } + : () => [], + isReadonlyAllowed: item.isReadonlyAllowed || false, + separator: item.separator || false, + icon: typeof icon === "function" ? icon : () => icon || "", + description: typeof description === "function" ? description : () => description || "", + textColor: item.textColor, + sequence: item.sequence || 0, + }; + } + class ChartJsComponent extends owl.Component { static template = "o-spreadsheet-ChartJsComponent"; canvas = owl.useRef("graphContainer"); @@ -3698,7 +3735,7 @@ } } `; - class ScorecardChart$1 extends owl.Component { + let ScorecardChart$1 = class ScorecardChart extends owl.Component { static template = "o-spreadsheet-ScorecardChart"; ctx = document.createElement("canvas").getContext("2d"); get runtime() { @@ -3807,7 +3844,7 @@ ? baseline : keyValue; } - } + }; class ScorecardScalableElement { style; constructor(style = {}) { @@ -6062,7 +6099,7 @@ }; } get childrenHaveIcon() { - return this.props.menuItems.some((menuItem) => !!menuItem.icon || !!menuItem.isActive); + return this.props.menuItems.some((menuItem) => !!this.getIconName(menuItem)); } getIconName(menu) { if (menu.icon(this.env)) { @@ -8239,8 +8276,8 @@ FLOOR_MATH: FLOOR_MATH, FLOOR_PRECISE: FLOOR_PRECISE, ISEVEN: ISEVEN, - ISO_CEILING: ISO_CEILING, ISODD: ISODD, + ISO_CEILING: ISO_CEILING, LN: LN, MOD: MOD, MUNIT: MUNIT, @@ -9138,10 +9175,10 @@ __proto__: null, AVEDEV: AVEDEV, AVERAGE: AVERAGE, - AVERAGE_WEIGHTED: AVERAGE_WEIGHTED, AVERAGEA: AVERAGEA, AVERAGEIF: AVERAGEIF, AVERAGEIFS: AVERAGEIFS, + AVERAGE_WEIGHTED: AVERAGE_WEIGHTED, COUNT: COUNT, COUNTA: COUNTA, COVAR: COVAR, @@ -9163,17 +9200,17 @@ QUARTILE_INC: QUARTILE_INC, SMALL: SMALL, STDEV: STDEV, - STDEV_P: STDEV_P, - STDEV_S: STDEV_S, STDEVA: STDEVA, STDEVP: STDEVP, STDEVPA: STDEVPA, + STDEV_P: STDEV_P, + STDEV_S: STDEV_S, VAR: VAR, - VAR_P: VAR_P, - VAR_S: VAR_S, VARA: VARA, VARP: VARP, - VARPA: VARPA + VARPA: VARPA, + VAR_P: VAR_P, + VAR_S: VAR_S }); function getMatchingCells(database, field, criteria, locale) { @@ -9256,7 +9293,7 @@ } // Example continuation: matchingRows = {0, 2} // 4 - return for each database row corresponding, the cells corresponding to the field parameter - const fieldCol = database[index].map((col) => col); + const fieldCol = database[index]; // Example continuation:: fieldCol = ["C", "j", "k", 7] const matchingCells = [...matchingRows].map((x) => fieldCol[x + 1]); // Example continuation:: matchingCells = ["j", 7] @@ -10256,9 +10293,14 @@ ISOWEEKNUM: ISOWEEKNUM, MINUTE: MINUTE, MONTH: MONTH, + MONTH_END: MONTH_END, + MONTH_START: MONTH_START, NETWORKDAYS: NETWORKDAYS, NETWORKDAYS_INTL: NETWORKDAYS_INTL, NOW: NOW, + QUARTER: QUARTER, + QUARTER_END: QUARTER_END, + QUARTER_START: QUARTER_START, SECOND: SECOND, TIME: TIME, TIMEVALUE: TIMEVALUE, @@ -10269,13 +10311,8 @@ WORKDAY_INTL: WORKDAY_INTL, YEAR: YEAR, YEARFRAC: YEARFRAC, - MONTH_START: MONTH_START, - MONTH_END: MONTH_END, - QUARTER: QUARTER, - QUARTER_START: QUARTER_START, - QUARTER_END: QUARTER_END, - YEAR_START: YEAR_START, - YEAR_END: YEAR_END + YEAR_END: YEAR_END, + YEAR_START: YEAR_START }); const DEFAULT_DELTA_ARG = 0; @@ -12407,8 +12444,8 @@ __proto__: null, ACCRINTM: ACCRINTM, AMORLINC: AMORLINC, - COUPDAYS: COUPDAYS, COUPDAYBS: COUPDAYBS, + COUPDAYS: COUPDAYS, COUPDAYSNC: COUPDAYSNC, COUPNCD: COUPNCD, COUPNUM: COUPNUM, @@ -12436,17 +12473,17 @@ PDURATION: PDURATION, PMT: PMT, PPMT: PPMT, - PV: PV, PRICE: PRICE, PRICEDISC: PRICEDISC, PRICEMAT: PRICEMAT, + PV: PV, RATE: RATE, RECEIVED: RECEIVED, RRI: RRI, SLN: SLN, SYD: SYD, - TBILLPRICE: TBILLPRICE, TBILLEQ: TBILLEQ, + TBILLPRICE: TBILLPRICE, TBILLYIELD: TBILLYIELD, VDB: VDB, XIRR: XIRR, @@ -12611,6 +12648,7 @@ var info = /*#__PURE__*/Object.freeze({ __proto__: null, + ISBLANK: ISBLANK, ISERR: ISERR, ISERROR: ISERROR, ISLOGICAL: ISLOGICAL, @@ -12618,7 +12656,6 @@ ISNONTEXT: ISNONTEXT, ISNUMBER: ISNUMBER, ISTEXT: ISTEXT, - ISBLANK: ISBLANK, NA: NA }); @@ -13853,10 +13890,10 @@ SEARCH: SEARCH, SPLIT: SPLIT, SUBSTITUTE: SUBSTITUTE, + TEXT: TEXT, TEXTJOIN: TEXTJOIN, TRIM: TRIM, - UPPER: UPPER, - TEXT: TEXT + UPPER: UPPER }); // ----------------------------------------------------------------------------- @@ -15288,39 +15325,6 @@ execute: (env) => env.model.dispatch("HIDE_SHEET", { sheetId: env.model.getters.getActiveSheetId() }), }; - function createActions(menuItems) { - return menuItems.map(createAction).sort((a, b) => a.sequence - b.sequence); - } - const uuidGenerator$2 = new UuidGenerator(); - function createAction(item) { - const name = item.name; - const children = item.children; - const description = item.description; - const icon = item.icon; - return { - id: item.id || uuidGenerator$2.uuidv4(), - name: typeof name === "function" ? name : () => name, - isVisible: item.isVisible ? item.isVisible : () => true, - isEnabled: item.isEnabled ? item.isEnabled : () => true, - isActive: item.isActive, - execute: item.execute, - children: children - ? (env) => { - return children - .map((child) => (typeof child === "function" ? child(env) : child)) - .flat() - .map(createAction); - } - : () => [], - isReadonlyAllowed: item.isReadonlyAllowed || false, - separator: item.separator || false, - icon: typeof icon === "function" ? icon : () => icon || "", - description: typeof description === "function" ? description : () => description || "", - textColor: item.textColor, - sequence: item.sequence || 0, - }; - } - /** * The class Registry is extended in order to add the function addChild * @@ -16835,8 +16839,6 @@ return "year"; } - // @ts-ignore - const Chart = window.Chart; class LineChart extends AbstractChart { dataSets; labelRange; @@ -17013,7 +17015,9 @@ generateLabels(chart) { // color the legend labels with the dataset color, without any transparency const { data } = chart; - const labels = Chart.defaults.plugins.legend.labels.generateLabels(chart); + /** @ts-ignore */ + const labels = window.Chart.defaults.plugins.legend.labels + .generateLabels(chart); for (const [index, label] of labels.entries()) { label.fillStyle = data.datasets[index].borderColor; } @@ -18831,26 +18835,26 @@ var ACTION_EDIT = /*#__PURE__*/Object.freeze({ __proto__: null, - undo: undo, - redo: redo, + clearCols: clearCols, + clearRows: clearRows, copy: copy, cut: cut, + deleteCellShiftLeft: deleteCellShiftLeft, + deleteCellShiftUp: deleteCellShiftUp, + deleteCells: deleteCells, + deleteCol: deleteCol, + deleteCols: deleteCols, + deleteRow: deleteRow, + deleteRows: deleteRows, + deleteValues: deleteValues, + findAndReplace: findAndReplace, + mergeCells: mergeCells, paste: paste, pasteSpecial: pasteSpecial, - pasteSpecialValue: pasteSpecialValue, pasteSpecialFormat: pasteSpecialFormat, - findAndReplace: findAndReplace, - deleteValues: deleteValues, - deleteRows: deleteRows, - deleteRow: deleteRow, - clearRows: clearRows, - deleteCols: deleteCols, - deleteCol: deleteCol, - clearCols: clearCols, - deleteCells: deleteCells, - deleteCellShiftUp: deleteCellShiftUp, - deleteCellShiftLeft: deleteCellShiftLeft, - mergeCells: mergeCells + pasteSpecialValue: pasteSpecialValue, + redo: redo, + undo: undo }); const insertRow = { @@ -19709,42 +19713,42 @@ var ACTION_FORMAT = /*#__PURE__*/Object.freeze({ __proto__: null, - formatNumberAutomatic: formatNumberAutomatic, - formatNumberNumber: formatNumberNumber, - formatPercent: formatPercent, - formatNumberPercent: formatNumberPercent, - formatNumberCurrency: formatNumberCurrency, - formatNumberCurrencyRounded: formatNumberCurrencyRounded, - formatCustomCurrency: formatCustomCurrency, - formatNumberDate: formatNumberDate, - formatNumberTime: formatNumberTime, - formatNumberDateTime: formatNumberDateTime, - formatNumberDuration: formatNumberDuration, - incraseDecimalPlaces: incraseDecimalPlaces, + clearFormat: clearFormat, decraseDecimalPlaces: decraseDecimalPlaces, - formatBold: formatBold, - formatItalic: formatItalic, - formatUnderline: formatUnderline, - formatStrikethrough: formatStrikethrough, - formatFontSize: formatFontSize, + fillColor: fillColor, formatAlignment: formatAlignment, + formatAlignmentBottom: formatAlignmentBottom, + formatAlignmentCenter: formatAlignmentCenter, formatAlignmentHorizontal: formatAlignmentHorizontal, formatAlignmentLeft: formatAlignmentLeft, - formatAlignmentCenter: formatAlignmentCenter, - formatAlignmentRight: formatAlignmentRight, - formatAlignmentVertical: formatAlignmentVertical, - formatAlignmentTop: formatAlignmentTop, formatAlignmentMiddle: formatAlignmentMiddle, - formatAlignmentBottom: formatAlignmentBottom, - formatWrappingIcon: formatWrappingIcon, + formatAlignmentRight: formatAlignmentRight, + formatAlignmentTop: formatAlignmentTop, + formatAlignmentVertical: formatAlignmentVertical, + formatBold: formatBold, + formatCF: formatCF, + formatCustomCurrency: formatCustomCurrency, + formatFontSize: formatFontSize, + formatItalic: formatItalic, + formatNumberAutomatic: formatNumberAutomatic, + formatNumberCurrency: formatNumberCurrency, + formatNumberCurrencyRounded: formatNumberCurrencyRounded, + formatNumberDate: formatNumberDate, + formatNumberDateTime: formatNumberDateTime, + formatNumberDuration: formatNumberDuration, + formatNumberNumber: formatNumberNumber, + formatNumberPercent: formatNumberPercent, + formatNumberTime: formatNumberTime, + formatPercent: formatPercent, + formatStrikethrough: formatStrikethrough, + formatUnderline: formatUnderline, formatWrapping: formatWrapping, + formatWrappingClip: formatWrappingClip, + formatWrappingIcon: formatWrappingIcon, formatWrappingOverflow: formatWrappingOverflow, formatWrappingWrap: formatWrappingWrap, - formatWrappingClip: formatWrappingClip, - textColor: textColor, - fillColor: fillColor, - formatCF: formatCF, - clearFormat: clearFormat + incraseDecimalPlaces: incraseDecimalPlaces, + textColor: textColor }); function interactiveFreezeColumnsRows(env, dimension, base) { @@ -19962,25 +19966,25 @@ var ACTION_VIEW = /*#__PURE__*/Object.freeze({ __proto__: null, - hideCols: hideCols, - unhideCols: unhideCols, - unhideAllCols: unhideAllCols, - hideRows: hideRows, - unhideRows: unhideRows, - unhideAllRows: unhideAllRows, - unFreezePane: unFreezePane, - freezePane: freezePane, - unFreezeRows: unFreezeRows, - freezeFirstRow: freezeFirstRow, - freezeSecondRow: freezeSecondRow, - freezeCurrentRow: freezeCurrentRow, - unFreezeCols: unFreezeCols, - freezeFirstCol: freezeFirstCol, - freezeSecondCol: freezeSecondCol, + createRemoveFilter: createRemoveFilter, freezeCurrentCol: freezeCurrentCol, - viewGridlines: viewGridlines, + freezeCurrentRow: freezeCurrentRow, + freezeFirstCol: freezeFirstCol, + freezeFirstRow: freezeFirstRow, + freezePane: freezePane, + freezeSecondCol: freezeSecondCol, + freezeSecondRow: freezeSecondRow, + hideCols: hideCols, + hideRows: hideRows, + unFreezeCols: unFreezeCols, + unFreezePane: unFreezePane, + unFreezeRows: unFreezeRows, + unhideAllCols: unhideAllCols, + unhideAllRows: unhideAllRows, + unhideCols: unhideCols, + unhideRows: unhideRows, viewFormulas: viewFormulas, - createRemoveFilter: createRemoveFilter + viewGridlines: viewGridlines }); const colMenuRegistry = new MenuItemRegistry(); @@ -20985,34 +20989,25 @@ } function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) { - const _onMouseDown = (ev) => { - ev.preventDefault(); - onMouseDown(ev); - }; - const _onMouseMove = (ev) => { - ev.preventDefault(); - onMouseMove(ev); - }; const _onMouseUp = (ev) => { - ev.preventDefault(); onMouseUp(ev); - window.removeEventListener("mousedown", _onMouseDown); + window.removeEventListener("mousedown", onMouseDown); window.removeEventListener("mouseup", _onMouseUp); window.removeEventListener("dragstart", _onDragStart); - window.removeEventListener("mousemove", _onMouseMove); - window.removeEventListener("wheel", _onMouseMove); + window.removeEventListener("mousemove", onMouseMove); + window.removeEventListener("wheel", onMouseMove); }; function _onDragStart(ev) { ev.preventDefault(); } - window.addEventListener("mousedown", _onMouseDown); + window.addEventListener("mousedown", onMouseDown); window.addEventListener("mouseup", _onMouseUp); window.addEventListener("dragstart", _onDragStart); - window.addEventListener("mousemove", _onMouseMove); + window.addEventListener("mousemove", onMouseMove); // mouse wheel on window is by default a passive event. // preventDefault() is not allowed in passive event handler. // https://chromestatus.com/feature/6662647093133312 - window.addEventListener("wheel", _onMouseMove, { passive: false }); + window.addEventListener("wheel", onMouseMove, { passive: false }); } /** * Function to be used during a mousedown event, this function allows to @@ -26534,7 +26529,7 @@ color: String, }; - class ScrollBar$1 { + let ScrollBar$1 = class ScrollBar { direction; el; constructor(el, direction) { @@ -26552,7 +26547,7 @@ this.el.scrollTop = value; } } - } + }; css /* scss */ ` .o-scrollbar { @@ -27034,7 +27029,11 @@ } let prevCol = col; let prevRow = row; - const onMouseMove = (col, row) => { + const onMouseMove = (col, row, ev) => { + // When selecting cells during the edition, we don't want to avoid the default + // browser behaviour that will select the text inside the composer + // (see related commit msg for more information) + ev.preventDefault(); if ((col !== prevCol && col != -1) || (row !== prevRow && row != -1)) { prevCol = col === -1 ? prevCol : col; prevRow = row === -1 ? prevRow : row; @@ -46971,6 +46970,11 @@ owl.useExternalListener(window, "resize", () => this.render(true)); owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this)); this.bindModelEvents(); + owl.onWillUpdateProps((nextProps) => { + if (nextProps.model !== this.props.model) { + throw new Error("Changing the props model is not supported at the moment."); + } + }); owl.onMounted(() => { this.checkViewportSize(); }); @@ -50744,6 +50748,8 @@ isDefined: isDefined$1, lazy, genericRepeat, + createAction, + createActions, }; const links = { isMarkdownLink, @@ -50768,6 +50774,7 @@ ScorecardChartConfigPanel, ScorecardChartDesignPanel, FigureComponent, + Menu, }; function addFunction(functionName, functionDescription) { functionRegistry.add(functionName, functionDescription); @@ -50813,12 +50820,10 @@ exports.setTranslationMethod = setTranslationMethod; exports.tokenize = tokenize; - Object.defineProperty(exports, '__esModule', { value: true }); - - __info__.version = '16.5.0-alpha.5'; - __info__.date = '2023-08-17T11:19:14.474Z'; - __info__.hash = 'e0cb3aa'; + __info__.version = '16.5.0-alpha.6'; + __info__.date = '2023-08-30T08:46:04.369Z'; + __info__.hash = ''; })(this.o_spreadsheet = this.o_spreadsheet || {}, owl); diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml index bcd2d07e907..8def81efd9e 100644 --- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml +++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml @@ -1,5 +1,5 @@ - + - +
- +
- +
- + Border Color
- +
- +
- +
- +
- +
- +
Standard
@@ -391,7 +391,7 @@ - +
- +
+
- +
+
- +
- +
- +
- + - +
@@ -650,7 +650,7 @@
- +
- +
- +
- + - +
- + - +
@@ -865,7 +865,7 @@
- +
- +
- +
- +
- + - +
@@ -1040,7 +1040,7 @@
- +
- +
- +
- +
- +
- +
@@ -1230,7 +1230,7 @@
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1755,7 +1755,7 @@ - + @@ -1763,7 +1763,7 @@ - + @@ -1775,12 +1775,12 @@ - + - + @@ -1788,7 +1788,7 @@ - + - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + A Z - + Z A - + - + - + - + - + - + - + % - + .0 - + .00 - + - + A A - + - + - + - + - + - +
@@ -2139,7 +2139,7 @@
- +
- +
- + - +
- +
- +
- +
- + Background Color
@@ -2458,7 +2458,7 @@
- +
Data range
@@ -2478,7 +2478,7 @@
- + Background Color
@@ -2544,7 +2544,7 @@
- +
@@ -2589,7 +2589,7 @@ - + - +
- +
Data Series
@@ -2678,7 +2678,7 @@
- + Background Color
@@ -2721,7 +2721,7 @@
- +
- + Background Color
@@ -2848,7 +2848,7 @@
- +
- +
Key value
@@ -2947,7 +2947,7 @@
- + Background Color Color Up Color Down @@ -3014,7 +3014,7 @@
- +
+ Fill Color Text Color
@@ -3115,11 +3115,11 @@
- +
Preview text
 - + Fill Color
@@ -3165,7 +3165,7 @@
- +
Preview
@@ -3187,7 +3187,7 @@
- +
@@ -3307,7 +3307,7 @@
- +
@@ -3358,7 +3358,7 @@
- +
Icons
@@ -3382,7 +3382,7 @@
- +
@@ -3425,7 +3425,7 @@
@@ -3467,7 +3467,7 @@
- +
@@ -3480,7 +3480,7 @@
- +
Currency
@@ -3542,7 +3542,7 @@
- +
Search
@@ -3631,7 +3631,7 @@
- +
Locale
@@ -3665,7 +3665,7 @@
- +
@@ -3689,7 +3689,7 @@
- +
@@ -3698,7 +3698,7 @@ - +
Separator
@@ -3749,7 +3749,7 @@
- +
- + Text Color Fill Color