{textArray[0] ||
buttonsIds.includes(KupColumnMenuIds.BUTTON_OPEN_IN_NEW) ||
- buttonsIds.includes(KupColumnMenuIds.BUTTON_SEARCH) ||
+ buttonsIds.includes(KupColumnMenuIds.BUTTON_PREVIEW) ||
buttonsIds.includes(KupColumnMenuIds.BUTTON_COPY_OBJ) ? (
{textArray[0] ? (
@@ -1508,7 +1508,7 @@ export function create15(component: KupCard): VNode {
KupColumnMenuIds.BUTTON_OPEN_IN_NEW
) ||
buttonsIds.includes(
- KupColumnMenuIds.BUTTON_SEARCH
+ KupColumnMenuIds.BUTTON_PREVIEW
) ||
buttonsIds.includes(
KupColumnMenuIds.BUTTON_COPY_OBJ
@@ -1526,13 +1526,13 @@ export function create15(component: KupCard): VNode {
/>
) : null}
{buttonsIds.includes(
- KupColumnMenuIds.BUTTON_SEARCH
+ KupColumnMenuIds.BUTTON_PREVIEW
) ? (
x.id ===
- KupColumnMenuIds.BUTTON_SEARCH
+ KupColumnMenuIds.BUTTON_PREVIEW
)}
/>
) : null}
diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
index f7ef5afc9..2ce686987 100644
--- a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
+++ b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
@@ -2113,12 +2113,28 @@ export class KupDataTable {
result: string | KupDataColumn,
afterColumn: string
) {
- this.visibleColumns = this.getVisibleColumns({
- includeCodVer: true,
- }).map((col) => col.name);
-
if (typeof result !== 'string') {
- if (this.visibleColumns.findIndex((c) => c === result.name) < 0) {
+ // Check if dataTable has visible columns
+ const dataTableHasVisibleColumns =
+ this.visibleColumns && this.visibleColumns.length > 0;
+
+ // - If dataTableHasVisibleColumns is true:
+ // return every col.name without filterings
+ // - If dataTableHasVisibleColumns is false:
+ // result column is filtered out because it is already inserted in the data
+ // and will make resultColumnIndexNotFound false, not adding the column
+ this.visibleColumns = this.getVisibleColumns({
+ includeCodVer: true,
+ }).map((col) => {
+ if (dataTableHasVisibleColumns || col.name !== result.name) {
+ return col.name;
+ }
+ });
+
+ const resultColumnIndexNotFound =
+ this.visibleColumns.findIndex((c) => c === result.name) < 0;
+
+ if (resultColumnIndexNotFound) {
this.#kupManager.debug.logMessage(
this,
'New column [' +
diff --git a/packages/ketchup/src/f-components/f-cell/f-cell.tsx b/packages/ketchup/src/f-components/f-cell/f-cell.tsx
index 63f31e1e0..beb31e8df 100644
--- a/packages/ketchup/src/f-components/f-cell/f-cell.tsx
+++ b/packages/ketchup/src/f-components/f-cell/f-cell.tsx
@@ -145,7 +145,7 @@ export const FCell: FunctionalComponent = (
content = setEditableCell(cellType, classObj, cell, column, props);
} else if (cell.data && kupTypes.includes(cellType)) {
if (props.setSizes) {
- setCellSizeKup(cellType, subcomponentProps, cell);
+ setCellSizeKup(cellType, subcomponentProps, cell, column);
}
if (!props.renderKup) {
const lazyClass = 'cell-' + cellType + ' placeholder';
@@ -295,7 +295,11 @@ const handleMouseEnter = (
const handleMouseLeave = (event: MouseEvent) => {
const parent = event.currentTarget as HTMLElement;
- const iconContainer = parent.querySelector('kup-image');
+ // only remove the action icon we added on mouse enter, not the first
+ // kup-image in the cell (which might be the BAR/IMAGE itself)
+ const iconContainer = parent.querySelector(
+ 'kup-image.f-cell__iconfunction'
+ );
if (iconContainer) {
iconContainer.remove();
@@ -607,13 +611,17 @@ function setCellSize(
function setCellSizeKup(
cellType: string,
subcomponentProps: unknown,
- cell: KupDataCell
+ cell: KupDataCell,
+ column: KupDataColumn
) {
switch (cellType) {
case FCellTypes.BAR:
if (!(subcomponentProps as FImageProps).sizeY) {
(subcomponentProps as FImageProps).sizeY = '26px';
}
+ if (!(subcomponentProps as FImageProps).sizeX && column.size) {
+ (subcomponentProps as FImageProps).sizeX = column.size;
+ }
break;
case FCellTypes.BUTTON:
let height: string = '';
diff --git a/packages/ketchup/src/managers/kup-data/kup-data-column-helper.ts b/packages/ketchup/src/managers/kup-data/kup-data-column-helper.ts
index 907cd3b77..d697ec6bc 100644
--- a/packages/ketchup/src/managers/kup-data/kup-data-column-helper.ts
+++ b/packages/ketchup/src/managers/kup-data/kup-data-column-helper.ts
@@ -370,8 +370,9 @@ function newColumnFromMath(
...firstColumn,
name: newName,
title: title ? title : newTitle,
- obj: newObj,
+ obj: newObj ?? { t: '', p: '', k: '' },
resultOf: formula,
+ visible: true,
};
dataset.columns.splice(
dataset.columns.indexOf(firstColumn) + 1,
diff --git a/packages/ketchup/src/utils/kup-column-menu/kup-column-menu-declarations.ts b/packages/ketchup/src/utils/kup-column-menu/kup-column-menu-declarations.ts
index f41355b13..40b4a9571 100644
--- a/packages/ketchup/src/utils/kup-column-menu/kup-column-menu-declarations.ts
+++ b/packages/ketchup/src/utils/kup-column-menu/kup-column-menu-declarations.ts
@@ -8,7 +8,7 @@ export enum KupColumnMenuIds {
BUTTON_NEW = 'new',
BUTTON_OPEN_IN_NEW = 'open-in-new',
BUTTON_REMOVE = 'remove',
- BUTTON_SEARCH = 'search',
+ BUTTON_PREVIEW = 'preview',
BUTTON_COPY_OBJ = 'copy-obj',
CHECKBOX_GLOBAL = 'global-checkbox',
SWITCH_GROUP = 'group',
diff --git a/yarn.lock b/yarn.lock
index 5731e3e05..abd7e5a1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3191,7 +3191,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@sme.up/ketchup-react@workspace:packages/ketchup-react"
dependencies:
- "@sme.up/ketchup": 10.4.9
+ "@sme.up/ketchup": 10.4.10
"@stencil/core": ^4
"@stencil/react-output-target": ^0.8
react: ^19.0.0
@@ -3227,7 +3227,7 @@ __metadata:
resolution: "@sme.up/ketchup-showcase@workspace:packages/ketchup-showcase"
dependencies:
"@babel/plugin-transform-private-methods": ^7.24.1
- "@sme.up/ketchup": ^10.4.9
+ "@sme.up/ketchup": ^10.4.10
"@typescript-eslint/eslint-plugin": ^5.59.8
"@typescript-eslint/parser": ^5.59.8
"@vue/cli-plugin-babel": ~5.0.8
@@ -3251,7 +3251,7 @@ __metadata:
languageName: unknown
linkType: soft
-"@sme.up/ketchup@10.4.9, @sme.up/ketchup@^10.4.9, @sme.up/ketchup@workspace:packages/ketchup":
+"@sme.up/ketchup@10.4.10, @sme.up/ketchup@^10.4.10, @sme.up/ketchup@workspace:packages/ketchup":
version: 0.0.0-use.local
resolution: "@sme.up/ketchup@workspace:packages/ketchup"
dependencies: