Merge branch 'main' into develop

imesong · Jul 2, 2022 · 79b1067 · 79b1067
2 parents 126bdcd + 7cbac49
commit 79b1067
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.19.2
+1.19.3
diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx
@@ -348,6 +348,7 @@ export function Table({
       filter: customFilter,
       width: width,
       columnOptions,
+      cellBackgroundColor: column.cellBackgroundColor,
       columnType,
       isEditable: column.isEditable,
       Cell: function (cell) {
@@ -954,6 +955,18 @@ export function Table({
                         }
                       }
                       const wrapAction = textWrapActions(cell.column.id);
+                      const rowChangeSet = changeSet ? changeSet[cell.row.index] : null;
+                      const cellValue = rowChangeSet ? rowChangeSet[cell.column.name] || cell.value : cell.value;
+                      const rowData = tableData[cell.row.index];
+                      const cellBackgroundColor = resolveReferences(
+                        cell.column?.cellBackgroundColor,
+                        currentState,
+                        '',
+                        {
+                          cellValue,
+                          rowData,
+                        }
+                      );
                       return (
                         // Does not require key as its already being passed by react-table via cellProps
                         // eslint-disable-next-line react/jsx-key
@@ -968,6 +981,7 @@ export function Table({
                             [cellSizeType]: true,
                           })}
                           {...cellProps}
+                          style={{ ...cellProps.style, backgroundColor: cellBackgroundColor ?? 'inherit' }}
                         >
                           <div className="td-container">{cell.render('Cell')}</div>
                         </td>

diff --git a/frontend/src/Editor/Inspector/Components/Table.jsx b/frontend/src/Editor/Inspector/Components/Table.jsx
@@ -364,6 +364,20 @@ class Table extends React.Component {
             </>
           )}
 
+          <div className="field mb-2">
+            <label className="form-label">Cell background color</label>
+            <CodeHinter
+              currentState={this.props.currentState}
+              initialValue={column.cellBackgroundColor ?? 'inherit'}
+              theme={this.props.darkMode ? 'monokai' : 'default'}
+              mode="javascript"
+              lineNumbers={false}
+              placeholder={''}
+              onChange={(value) => this.onColumnItemChange(index, 'cellBackgroundColor', value)}
+              componentName={this.getPopoverFieldSource(column.columnType, 'cellBackgroundColor')}
+            />
+          </div>
+
           {column.columnType === 'datepicker' && (
             <div>
               <label className="form-label">Date Display Format</label>

diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-1.19.2
+1.19.3