slick-table 1.1.16 → 1.1.18

package/src/entities/popup-summary/ui/TotalByColumn/TotalByColumn.tsx

@@ -1,9 +1,12 @@
 import { Tooltip } from "@mui/material";
 import { FC, useState } from "react";
+import { FormatterResultWithHtml, FormatterResultWithText } from "slickgrid";
+
+import { StyledDialogContentText } from "../styles";
 
 import Styled from "./TotalByColumn.style";
 
-export const TotalByColumn: FC<IProps> = ({ label, total }) => {
+export const TotalByColumn: FC<IProps> = ({ label, total, totalFormatted }) => {
 	const [open, setOpen] = useState(false);
 
 	function copyToClipboard() {
@@ -15,8 +18,8 @@ export const TotalByColumn: FC<IProps> = ({ label, total }) => {
 	}
 
 	return (
-		<Styled.DialogContentText>
-			<Styled.Text>{`- total ${label}: ${total}`}</Styled.Text>
+		<StyledDialogContentText>
+			<Styled.Text>{`total ${label}: ${totalFormatted}`}</Styled.Text>
 			{open ? (
 				<Styled.Icon className={"sgi sgi-check"}></Styled.Icon>
 			) : (
@@ -27,11 +30,17 @@ export const TotalByColumn: FC<IProps> = ({ label, total }) => {
 					/>
 				</Tooltip>
 			)}
-		</Styled.DialogContentText>
+		</StyledDialogContentText>
 	);
 };
 
 interface IProps {
 	label: string;
 	total: number;
+	totalFormatted:
+		| string
+		| HTMLElement
+		| DocumentFragment
+		| FormatterResultWithHtml
+		| FormatterResultWithText;
 }

package/src/entities/popup-summary/ui/styles/StyledDialogContentText.ts

@@ -0,0 +1,7 @@
+import { DialogContentText, styled } from "@mui/material";
+
+export const StyledDialogContentText = styled(DialogContentText)({
+	alignItems: "center",
+	color: "#1E456F",
+	display: "flex",
+});

package/src/entities/popup-summary/ui/styles/index.ts

@@ -0,0 +1 @@
+export { StyledDialogContentText } from "./StyledDialogContentText";

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

@@ -1,8 +1,6 @@
 import { Dispatch, FC, SetStateAction } from "react";
 
-import { eventContextMenu } from "shared/lib/slickgrid";
-
-import { eventSummary } from "entities/popup-summary";
+import { eventContextMenu, eventSummary } from "shared/lib/slickgrid";
 
 import Styled from "../ContextMenu.style";
 
@@ -14,7 +12,7 @@ export const ButtonSummary: FC<IProps> = ({ setIsOpened }) => {
 	function openSummary() {
 		if (!table) return;
 		setIsOpened(false);
-		eventContextMenu.table = table;
+		eventSummary.table = table;
 		eventSummary.open = true;
 	}
 

package/src/index.scss

@@ -1,2 +1,3 @@
 @use './app/styles/slickgrid' as *;
-@use './app/styles/global' as *;
+@use './app/styles/global' as *;
+@use './app/styles/icons' as *;

package/src/index.ts

@@ -19,6 +19,8 @@ export {
 	SlickTable,
 	SlickgridTable,
 	TotalCalculator,
+	WithSummary,
+	WithoutHotKeys,
 	columnIsEdited,
 	columnCheckboxSelector,
 	commitCurrentEdit,

package/src/shared/lib/slickgrid/index.ts

@@ -60,9 +60,11 @@ export {
 	RedoUndoOnly,
 	SlickTable,
 	WithConfirmationOfDeletion,
+	WithSummary,
 	WithoutHotKeys,
 	eventContextMenu,
 	eventHeaderContextMenu,
+	eventSummary,
 } from "./model";
 export {
 	SlickgridTable,

package/src/shared/lib/slickgrid/lib/hotKeys/hotKeysOpenSummary.ts

@@ -0,0 +1,7 @@
+import { OnKeyDownEventArgs, SlickEventData } from "slickgrid";
+
+import { EKeyCode } from "shared/model/enums";
+
+export function hotKeysOpenSummary(event: SlickEventData<OnKeyDownEventArgs>) {
+	return event.altKey && event.keyCode === EKeyCode.KeyS;
+}

package/src/shared/lib/slickgrid/lib/hotKeys/index.ts

@@ -1,5 +1,6 @@
 export { hotKeysCopy } from "./hotKeysCopy";
 export { hotKeysDelete } from "./hotKeysDelete";
+export { hotKeysOpenSummary } from "./hotKeysOpenSummary";
 export { hotKeysRedo } from "./hotKeysRedo";
 export { hotKeysReverse } from "./hotKeysReverse";
 export { hotKeysUndo } from "./hotKeysUndo";

package/src/shared/lib/slickgrid/lib/index.ts

@@ -15,6 +15,7 @@ export {
 export {
 	hotKeysCopy,
 	hotKeysDelete,
+	hotKeysOpenSummary,
 	hotKeysRedo,
 	hotKeysReverse,
 	hotKeysUndo,

package/src/shared/lib/slickgrid/model/SlickTable/hotKeys/decorators/WithSummary.ts

@@ -0,0 +1,28 @@
+import { OnKeyDownEventArgs, SlickEventData } from "slickgrid";
+
+import { eventSummary } from "shared/lib/slickgrid";
+import { ISlickTable } from "shared/model/types";
+
+import { hotKeysOpenSummary } from "../../../../lib";
+import { HotKeysDecorator } from "./HotKeysDecorator";
+
+export class WithSummary extends HotKeysDecorator {
+	public handleKeyboardEvent(
+		event: SlickEventData<OnKeyDownEventArgs>,
+		table: ISlickTable,
+	): void {
+		if (!table.isActive) return;
+		if (hotKeysOpenSummary(event)) {
+			if (!table.summaryColumnIds.length) return;
+			const grid = table.grid;
+			if (!grid) return;
+			if (grid.getSelectedRows().length < 2) return;
+			event.preventDefault();
+			event.stopImmediatePropagation();
+			eventSummary.table = table;
+			eventSummary.open = true;
+		} else {
+			super.handleKeyboardEvent.call(this, event, table);
+		}
+	}
+}

package/src/shared/lib/slickgrid/model/SlickTable/hotKeys/decorators/index.ts

@@ -2,3 +2,4 @@ export { HotKeysDecorator } from "./HotKeysDecorator";
 export { PreventCopying } from "./PreventCopying";
 export { RedoUndoOnly } from "./RedoUndoOnly";
 export { WithConfirmationOfDeletion } from "./WithConfirmationOfDeletion";
+export { WithSummary } from "./WithSummary";

package/src/shared/lib/slickgrid/model/SlickTable/hotKeys/index.ts

@@ -5,4 +5,5 @@ export {
 	PreventCopying,
 	RedoUndoOnly,
 	WithConfirmationOfDeletion,
+	WithSummary,
 } from "./decorators";

package/src/shared/lib/slickgrid/model/SlickTable/index.ts

@@ -6,6 +6,7 @@ export {
 	PreventCopying,
 	RedoUndoOnly,
 	WithConfirmationOfDeletion,
+	WithSummary,
 	WithoutHotKeys,
 } from "./hotKeys";
 export {

package/src/{entities/popup-summary/model/event → shared/lib/slickgrid/model/events}/eventSummary.ts

@@ -1,7 +1,9 @@
 import { AnEvent } from "shared/lib/an-event";
+import { ISlickTable } from "shared/model/types";
 
 class EventSummary extends AnEvent {
 	private _open = false;
+	private _table: ISlickTable | undefined;
 
 	get open() {
 		return this._open;
@@ -10,6 +12,13 @@ class EventSummary extends AnEvent {
 		this._open = open;
 		this.notify();
 	}
+
+	get table() {
+		return this._table;
+	}
+	set table(table) {
+		this._table = table;
+	}
 }
 
 export const eventSummary = new EventSummary();

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

@@ -1,2 +1,3 @@
 export { eventContextMenu } from "./eventContextMenu";
 export { eventHeaderContextMenu } from "./eventHeaderContextMenu";
+export { eventSummary } from "./eventSummary";

package/src/shared/lib/slickgrid/model/index.ts

@@ -14,6 +14,11 @@ export {
 	RedoUndoOnly,
 	SlickTable,
 	WithConfirmationOfDeletion,
+	WithSummary,
 	WithoutHotKeys,
 } from "./SlickTable";
-export { eventContextMenu, eventHeaderContextMenu } from "./events";
+export {
+	eventContextMenu,
+	eventHeaderContextMenu,
+	eventSummary,
+} from "./events";

package/src/shared/model/enums/EKeyCode.ts

@@ -3,6 +3,7 @@ export enum EKeyCode {
 	"KeyDel" = 46,
 	"KeyEnter" = 13,
 	"KeyR" = 82,
+	"KeyS" = 83,
 	"KeyY" = 89,
 	"KeyZ" = 90,
 }

package/dist/types/entities/popup-summary/model/event/eventSummary.d.ts

@@ -1,9 +0,0 @@
-import { AnEvent } from '../../../../shared/lib/an-event';
-declare class EventSummary extends AnEvent {
-    private _open;
-    get open(): boolean;
-    set open(open: boolean);
-}
-export declare const eventSummary: EventSummary;
-export {};
-//# sourceMappingURL=eventSummary.d.ts.map

package/dist/types/entities/popup-summary/model/event/eventSummary.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eventSummary.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-summary/model/event/eventSummary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,cAAM,YAAa,SAAQ,OAAO;IACjC,OAAO,CAAC,KAAK,CAAS;IAEtB,IAAI,IAAI,YAEP;IACD,IAAI,IAAI,CAAC,IAAI,SAAA,EAGZ;CACD;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}

package/dist/types/entities/popup-summary/model/event/index.d.ts

@@ -1,2 +0,0 @@
-export { eventSummary } from './eventSummary';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-summary/model/event/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-summary/model/event/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}

package/src/entities/popup-summary/model/event/index.ts

@@ -1 +0,0 @@
-export { eventSummary } from "./eventSummary";