slick-table 1.1.56 → 1.1.58

package/src/features/column-filters/ui/ColumnFilters.tsx

@@ -13,14 +13,14 @@ import { SelectFilter } from "./SelectFilter";
 
 import Styled from "./ColumnFilters.style";
 
-export const ColumnFilters: FC = () => {
+export const ColumnFilters: FC<Props> = ({ tableId }) => {
 	const [value, setValue] = useState<IColumnFilterValue>(defaultValue);
 	const [filterId, setFilterId] = useState<EColumnFilter>(
 		EColumnFilter.TextContain,
 	);
 	const [isOpened, setIsOpened] = useState(false);
 
-	useSubscribeToEvent(setIsOpened);
+	useSubscribeToEvent(setIsOpened, tableId);
 	useOpenMenu(isOpened, setFilterId, setValue);
 
 	if (!isOpened) return null;
@@ -42,3 +42,7 @@ export const ColumnFilters: FC = () => {
 		</Fragment>
 	);
 };
+
+interface Props {
+	tableId: string;
+}

package/src/features/context-menu/lib/hooks/useSubscribeToEvent.ts

@@ -8,14 +8,16 @@ import { CONTEXT_MENU } from "../../model";
 
 export function useSubscribeToEvent(
 	setIsOpened: Dispatch<SetStateAction<boolean>>,
+	tableId: string,
 ) {
 	useEffect(() => {
 		function callback() {
+			const { table, x, y } = eventContextMenu;
+			if (table?.id !== tableId) return;
 			setIsOpened(true);
 			setTimeout(() => {
 				const menu = document.getElementById(CONTEXT_MENU);
 				if (!menu) return;
-				const { x, y } = eventContextMenu;
 				makeVisible(menu, x, y);
 			}, 0);
 		}
@@ -23,5 +25,5 @@ export function useSubscribeToEvent(
 		return () => {
 			eventContextMenu.unsubscribe(callback);
 		};
-	}, []);
+	}, [tableId]);
 }

package/src/features/context-menu/model/consts/id.ts

@@ -1 +1 @@
-export const CONTEXT_MENU = "context_menu";
+export const CONTEXT_MENU = "context-menu";

package/src/features/context-menu/ui/ButtonSummary/ButtonSummary.tsx

@@ -14,6 +14,8 @@ export const ButtonSummary: FC<IProps> = ({ setIsOpened }) => {
 		setIsOpened(false);
 		eventSummary.table = table;
 		eventSummary.open = true;
+		eventSummary.x = eventContextMenu.x;
+		eventSummary.y = eventContextMenu.y;
 	}
 
 	if (!table?.summaryColumnIds.length || Number(selectedRows?.length) < 2)

package/src/features/context-menu/ui/ContextMenu.tsx

@@ -16,10 +16,10 @@ import { Print } from "./Print";
 
 import Styled from "./ContextMenu.style";
 
-export const ContextMenu: FC = () => {
+export const ContextMenu: FC<Props> = ({ tableId }) => {
 	const [isOpened, setIsOpened] = useState(false);
 
-	useSubscribeToEvent(setIsOpened);
+	useSubscribeToEvent(setIsOpened, tableId);
 
 	if (!isOpened) return null;
 
@@ -42,3 +42,7 @@ export const ContextMenu: FC = () => {
 		</Fragment>
 	);
 };
+
+interface Props {
+	tableId: string;
+}

package/src/features/header-context-menu/lib/hooks/useSubscribeToEvent.ts

@@ -8,14 +8,16 @@ import { HEADER_CONTEXT_MENU } from "../../model";
 
 export function useSubscribeToEvent(
 	setIsOpened: Dispatch<SetStateAction<boolean>>,
+	tableId: string,
 ) {
 	useEffect(() => {
 		function callback() {
+			const { table, x, y } = eventHeaderContextMenu;
+			if (table?.id !== tableId) return;
 			setIsOpened(true);
 			setTimeout(() => {
 				const menu = document.getElementById(HEADER_CONTEXT_MENU);
 				if (!menu) return;
-				const { x, y } = eventHeaderContextMenu;
 				makeVisible(menu, x, y);
 			}, 0);
 		}
@@ -23,5 +25,5 @@ export function useSubscribeToEvent(
 		return () => {
 			eventHeaderContextMenu.unsubscribe(callback);
 		};
-	}, []);
+	}, [tableId]);
 }

package/src/features/header-context-menu/ui/HeaderContextMenu.tsx

@@ -13,11 +13,11 @@ import { Title } from "./Title";
 
 import Styled from "./HeaderContextMenu.style";
 
-export const HeaderContextMenu: FC = () => {
+export const HeaderContextMenu: FC<Props> = ({ tableId }) => {
 	const [checked, setChecked] = useState<string[]>([]);
 	const [isOpened, setIsOpened] = useState(false);
 
-	useSubscribeToEvent(setIsOpened);
+	useSubscribeToEvent(setIsOpened, tableId);
 
 	useEffect(() => {
 		if (!isOpened) return;
@@ -59,3 +59,7 @@ export const HeaderContextMenu: FC = () => {
 		</Fragment>
 	);
 };
+
+interface Props {
+	tableId: string;
+}

package/src/index.ts

@@ -38,7 +38,6 @@ export {
 	hotKeysRedo,
 	hotKeysUndo,
 	openColumnFilter,
-	openContextMenu,
 	printerCheckMark,
 	useListenIfTablesWereEdited,
 } from "shared/lib/slickgrid";

package/src/shared/lib/slickgrid/model/events/eventSummary.ts

@@ -4,6 +4,8 @@ import { ISlickTable } from "shared/model/types";
 class EventSummary extends AnEvent {
 	private _open = false;
 	private _table: ISlickTable | undefined;
+	x = 0;
+	y = 0;
 
 	get open() {
 		return this._open;

package/src/shared/lib/slickgrid/ui/SlickgridTable/ui/SlickgridTable.tsx

@@ -37,7 +37,7 @@ export const SlickgridTable: FC<Props> = ({
 		return <Styled.Skeleton animation="wave" variant={"rectangular"} />;
 
 	return (
-		<Styled.Wrapper id={"slick-table"}>
+		<Styled.Wrapper className={"slick-table"}>
 			<Table
 				SlickDataView={SlickDataView}
 				applyCellCssStyles={applyCellCssStyles}
@@ -59,10 +59,10 @@ export const SlickgridTable: FC<Props> = ({
 				options={options}
 				table={table}
 			/>
-			<HeaderContextMenu />
-			<ColumnFilters />
-			<ContextMenu />
-			<PopupSummary />
+			<HeaderContextMenu tableId={table.id} />
+			<ColumnFilters tableId={table.id} />
+			<ContextMenu tableId={table.id} />
+			<PopupSummary tableId={table.id} />
 		</Styled.Wrapper>
 	);
 };

package/dist/types/entities/popup-summary/lib/getTotals.d.ts

@@ -1,4 +0,0 @@
-import { ISlickTable } from '../../../shared/model/types';
-import { ITotal } from '../model';
-export declare function getTotals(table: ISlickTable | undefined): ITotal;
-//# sourceMappingURL=getTotals.d.ts.map

package/dist/types/entities/popup-summary/lib/getTotals.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getTotals.d.ts","sourceRoot":"","sources":["../../../../../src/entities/popup-summary/lib/getTotals.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,SAAS,GAAG,MAAM,CAuChE"}