@adaptabletools/adaptable 18.0.0-canary.34 → 18.0.0-canary.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.34",
+  "version": "18.0.0-canary.35",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -103,7 +103,7 @@ export interface AgGridMenuItem<MENU_TYPE> {
 /**
  * System Menu Item that is provided by AdapTable
  */
-export interface AdaptableSystemMenuItem<MENU_TYPE_NAME> extends AdaptableMenuItem<MENU_TYPE_NAME> {
+export interface AdaptableSystemMenuItem<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName> extends AdaptableMenuItem<MENU_TYPE_NAME> {
     /**
      * Type of Menu - always 'Adaptable'
      */

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -26,7 +26,7 @@ export type AdaptableColumnMenuItem = AdaptableMenuItem<AdaptableContextMenuItem
 /**
  * Generic Menu item used by Adaptable in Column or Context Menus
  */
-export interface AdaptableMenuItem<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> {
+export interface AdaptableMenuItem<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> {
     /**
      * Unique name for the Menu Item
      */

package/src/Strategy/AdaptableModuleBase.d.ts

@@ -39,16 +39,16 @@ export declare abstract class AdaptableModuleBase implements IModule {
     createModuleMenuItem(source: 'ModuleMenu' | 'ModuleButton'): AdaptableMenuItem | undefined;
     createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<AdaptableColumnMenuItemName>[] | undefined;
     createContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem<AdaptableContextMenuItemName>[] | undefined;
-    createMainMenuItemShowPopup<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>({ Name, Label, ComponentName, Icon, PopupParams, }: {
+    createMainMenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>({ Name, Label, ComponentName, Icon, PopupParams, }: {
         Name: MENU_TYPE_NAME;
         Label: string;
         ComponentName: string;
         Icon: AdaptableSystemIconName;
         PopupParams?: ModuleParams;
     }): MenuItemShowPopup<MENU_TYPE_NAME>;
-    createMenuItemClickFunction<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction<MENU_TYPE_NAME>;
-    createMenuItemReduxAction<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction<MENU_TYPE_NAME>;
-    createMenuItemShowPopup<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup<MENU_TYPE_NAME>;
+    createMenuItemClickFunction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, ClickFunction: () => void): MenuItemDoClickFunction<MENU_TYPE_NAME>;
+    createMenuItemReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, Icon: AdaptableSystemIconName, Action: Action): MenuItemDoReduxAction<MENU_TYPE_NAME>;
+    createMenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName>(Name: MENU_TYPE_NAME, Label: string, ComponentName: string, Icon: AdaptableSystemIconName, PopupParams?: ModuleParams): MenuItemShowPopup<MENU_TYPE_NAME>;
     getTeamSharingAction(): TeamSharingImportInfo<AdaptableObject> | undefined;
     getModuleNamedQueryReferences(): string[];
     getModuleCalculatedColumnReferences(): CalculatedColumn[];

package/src/Utilities/MenuItem.d.ts

@@ -3,7 +3,7 @@ import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProp
 import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../PredefinedConfig/Common/Menu';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableIcon, AdaptableSystemIconName } from '../PredefinedConfig/Common/AdaptableIcon';
-export declare class MenuItemDoReduxAction<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
+export declare class MenuItemDoReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
     name: MENU_TYPE_NAME;
     reduxAction: Redux.Action;
@@ -12,7 +12,7 @@ export declare class MenuItemDoReduxAction<MENU_TYPE_NAME = AdaptableColumnMenuI
     isVisible: boolean;
     icon: AdaptableIcon;
 }
-export declare class MenuItemDoClickFunction<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
+export declare class MenuItemDoClickFunction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, clickFunction: () => void, icon: AdaptableSystemIconName, isVisible: boolean);
     name: MENU_TYPE_NAME;
     onClick: () => void;
@@ -21,7 +21,7 @@ export declare class MenuItemDoClickFunction<MENU_TYPE_NAME = AdaptableColumnMen
     isVisible: boolean;
     icon: AdaptableIcon;
 }
-export declare class MenuItemShowPopup<MENU_TYPE_NAME = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
+export declare class MenuItemShowPopup<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, componentName: string, icon: AdaptableSystemIconName, isVisible: boolean, popupParams?: ModuleParams);
     name: MENU_TYPE_NAME;
     reduxAction: Redux.Action;

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1712926394596 || Date.now(),
-    VERSION: "18.0.0-canary.34" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1712929460827 || Date.now(),
+    VERSION: "18.0.0-canary.35" || '--current-version--',
 };