@adaptabletools/adaptable 16.0.0-canary.3 → 16.0.0-canary.5

package/src/AdaptableOptions/Fdc3Options.d.ts

@@ -0,0 +1,279 @@
+import { ChartContext, ChatInitSettingsContext, ContactContext, ContactListContext, CountryContext, CurrencyContext, EmailContext, Fdc3Context, Fdc3ContextType, Fdc3CustomContext, Fdc3CustomContextType, InstrumentContext, InstrumentListContext, OrganizationContext, PortfolioContext, PositionContext, TimeRangeContext, ValuationContext } from '../PredefinedConfig/Common/Fdc3Context';
+import { BaseContext } from '../PredefinedConfig/Common/BaseContext';
+import { IRowNode } from '@ag-grid-community/core';
+import { Context, ContextMetadata, IntentResult } from '@finos/fdc3';
+import { CompatibleContext, Fdc3CustomIntentType, Fdc3IntentType } from '../PredefinedConfig/Common/Fdc3Intent';
+import { AdaptableIcon } from '../PredefinedConfig/Common/AdaptableIcon';
+import { ButtonStyle } from '../PredefinedConfig/Common/ButtonStyle';
+/**
+ * Options for configuring FDC3 in AdapTable
+ */
+export interface Fdc3Options {
+    /**
+     * Enable FDC3 in AdapTable
+     *
+     * @defaultValue false
+     */
+    enableFdc3?: boolean;
+    /**
+     * Enable logging of message exchanges in the Console
+     *
+     * @defaultValue false
+     */
+    enableLogging?: boolean;
+    /**
+     * Maps the Context Type to the AdapTable Grid Data
+     */
+    gridDataContextMapping?: GridDataContextMapping;
+    /**
+     * Builds the Context Data (useful for postprocessing the Context Data mapped from the grid data)
+     */
+    resolveContextData?: (context: ResolveContextDataContext) => Fdc3Context;
+    /**
+     * Configures the FDC3 standard Intents that AdaptTable will listen for and raise
+     */
+    intents?: {
+        /**
+         * Subscribe to the given standard Intent(s)
+         */
+        listensFor?: Fdc3IntentType[];
+        /**
+         * Raises the given standard Intent(s) on various Grid Actions
+         */
+        raises?: {
+            [K in Fdc3IntentType]?: RaiseIntentConfig<K>[];
+        };
+    };
+    /**
+     * Configures the FDC3 custom Intents that AdaptTable will listen for and raise
+     */
+    customIntents?: {
+        /**
+         * Subscribe to the given custom Intent(s)
+         */
+        listensFor?: Fdc3CustomIntentType[];
+        /**
+         * Raises the given custom Intent(s) on various Grid Actions
+         */
+        raises?: {
+            [K in Fdc3CustomIntentType]: RaiseIntentConfig[];
+        };
+    };
+    /**
+     * Configures the FDC3 standard Contexts that AdaptTable will listen for and broadcast
+     */
+    contexts?: {
+        /**
+         * Subscribe to the given standard Context(s)
+         */
+        listensFor?: Fdc3ContextType[];
+        /**
+         * Broadcasts the given standard Context(s) on various Grid Actions
+         */
+        broadcasts?: {
+            [K in Fdc3ContextType]?: BroadcastConfig;
+        };
+    };
+    /**
+     * Configures the FDC3 custom Contexts that AdaptTable will listen for and broadcast
+     */
+    customContexts?: {
+        /**
+         * Subscribe to the given custom Context(s)
+         */
+        listensFor?: Fdc3CustomContextType[];
+        /**
+         * Broadcasts the given custom Context(s) on various Grid Actions
+         */
+        broadcasts?: {
+            [K in Fdc3CustomContextType]?: BroadcastConfig;
+        };
+    };
+    /**
+     * Handles incoming Intents (both standard and custom)
+     */
+    handleIntent?: (context: HandleFdc3IntentContext) => Promise<IntentResult> | void;
+    /**
+     * Handles incoming Contexts (both standard and custom)
+     */
+    handleContext?: (context: HandleFdc3Context) => void;
+    /**
+     * Customises the FDC3 Actions column
+     */
+    actionColumnDefaultConfiguration?: {
+        /**
+         * @defaultValue 'FDC3 Actions'
+         */
+        headerName?: string;
+        /**
+         * @defaultValue '200' (pixels)
+         */
+        width?: number;
+        /**
+         * @defaultValue true
+         */
+        resizable?: boolean;
+        /**
+         * @defaultValue true
+         */
+        movable?: boolean;
+    };
+}
+/**
+ * Context used when resolving FDC3 Context Data
+ */
+export interface ResolveContextDataContext extends BaseContext {
+    /**
+     * The FDC3 Context Type
+     */
+    contextType: Fdc3ContextType | Fdc3CustomContextType;
+    /**
+     * The FDC3 Context Data which has been mapped from the grid data based on the given configuration in `gridDataContextMapping`
+     */
+    contextMappedFromGridData?: Fdc3Context;
+    /**
+     * The row node which is the source of the context data
+     */
+    rowNode: IRowNode;
+    /**
+     * The row data which is the source of the context data
+     */
+    rowData: any;
+    /**
+     * Primary key value of row
+     */
+    primaryKeyValue: any;
+}
+/**
+ * Context used when handling incoming FDC3 messages
+ */
+export interface HandleFdc3Context extends BaseContext {
+    /**
+     * The FDC3 Context
+     */
+    context: Context;
+    /**
+     * The FDC3 Context Metadata related to the context
+     */
+    metadata?: ContextMetadata;
+}
+/**
+ * Context used when handling incoming FDC3 messages
+ */
+export interface HandleFdc3IntentContext extends HandleFdc3Context {
+    /**
+     * The FDC3 Intent
+     */
+    intent: Fdc3IntentType | Fdc3CustomIntentType;
+}
+/**
+ * Mapping of FDC3 Context Types to Grid Data/Columns
+ */
+export interface GridDataContextMapping {
+    'fdc3.chart'?: Fdc3ContentMapping<ChartContext>;
+    'fdc3.chat.initSettings'?: Fdc3ContentMapping<ChatInitSettingsContext>;
+    'fdc3.contact'?: Fdc3ContentMapping<ContactContext>;
+    'fdc3.contactList'?: Fdc3ContentMapping<ContactListContext>;
+    'fdc3.country'?: Fdc3ContentMapping<CountryContext>;
+    'fdc3.currency'?: Fdc3ContentMapping<CurrencyContext>;
+    'fdc3.email'?: Fdc3ContentMapping<EmailContext>;
+    'fdc3.instrument'?: Fdc3ContentMapping<InstrumentContext>;
+    'fdc3.instrumentList'?: Fdc3ContentMapping<InstrumentListContext>;
+    'fdc3.organization'?: Fdc3ContentMapping<OrganizationContext>;
+    'fdc3.portfolio'?: Fdc3ContentMapping<PortfolioContext>;
+    'fdc3.position'?: Fdc3ContentMapping<PositionContext>;
+    'fdc3.timerange'?: Fdc3ContentMapping<TimeRangeContext>;
+    'fdc3.valuation'?: Fdc3ContentMapping<ValuationContext>;
+}
+export declare const ColumnRefTypePrefix = "_colId.";
+export declare const FieldRefTypePrefix = "_field.";
+export declare type GridDataRef = `_colId.${string}` | `_field.${string}`;
+export declare type Fdc3ContentMapping<T> = PropertiesToGridRefs<Omit<T, 'type'>>;
+export interface RaiseIntentConfig<K extends Fdc3IntentType = any> {
+    contextType: CompatibleContext<K>;
+    contextMenu?: {
+        columnIds: string[];
+    };
+    actionButton?: Fdc3AdaptableButton;
+    actionColumn?: {
+        columnId: string;
+        friendlyName?: string;
+        button: Fdc3AdaptableButton;
+        width?: number;
+    };
+}
+export interface BroadcastConfig {
+    contextMenu?: {
+        columnIds: string[];
+    };
+    actionButton?: Fdc3AdaptableButton;
+    actionColumn?: {
+        columnId: string;
+        friendlyName?: string;
+        button: Fdc3AdaptableButton;
+        defaultWidth?: number;
+    };
+}
+/**
+ * Context provided in dynamic FDC3 Buttons
+ */
+export interface Fdc3ButtonContext extends BaseContext {
+    /**
+     * The FDC3 Context
+     */
+    context: Fdc3Context | Fdc3CustomContext;
+    /**
+     * The FDC3 Intent
+     */
+    intent?: Fdc3IntentType | Fdc3CustomIntentType;
+    /**
+     * The row node which is the source of the context data
+     */
+    rowNode: IRowNode;
+    /**
+     * The row data which is the source of the context data
+     */
+    rowData: any;
+    /**
+     * Primary key value of row
+     */
+    primaryKeyValue: any;
+}
+export interface Fdc3AdaptableButton {
+    /**
+     * Unique id for the button
+     */
+    id: string;
+    /**
+     * Icon for Button - can be object or function that provides a `AdaptableIcon` object
+     */
+    icon?: '_defaultFdc3' | AdaptableIcon | ((button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => AdaptableIcon);
+    /**
+     * Label for Button - can be string or function that provides string
+     */
+    label?: '_defaultFdc3' | string | ((button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => string);
+    /**
+     * Tooltip for Button - can be string or function that provides string
+     */
+    tooltip?: '_defaultFdc3' | string | ((button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => string);
+    /**
+     * Style for Button - can be object or function that provides a `ButtonStyle` object
+     */
+    buttonStyle?: ButtonStyle | ((button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => ButtonStyle);
+    /**
+     * Function that disables / enables the button based on its evaluation result
+     */
+    disabled?: (button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => boolean;
+    /**
+     * Function which sets whether Button is hidden
+     */
+    hidden?: (button: Fdc3AdaptableButton, context: Fdc3ButtonContext) => boolean;
+}
+/**
+ * TypeScript magic to convert all non-string property types to string (but keep the object structures), incl. nested objects.
+ */
+declare type PropertiesToGridRefs<Type> = Type extends object ? ReplaceTypes<Type> : Type extends string ? GridDataRef : Type extends Date ? GridDataRef : Type;
+declare type ReplaceTypes<ObjType extends object> = {
+    [KeyType in keyof ObjType]: PropertiesToGridRefs<ObjType[KeyType]>;
+};
+export {};

package/src/AdaptableOptions/Fdc3Options.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FieldRefTypePrefix = exports.ColumnRefTypePrefix = void 0;
+exports.ColumnRefTypePrefix = '_colId.';
+exports.FieldRefTypePrefix = '_field.';

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,5 +1,5 @@
-import { AdaptableApi, AdaptableIcon, ContextMenuContext, FDC3Context, GridCell } from '../../types';
-import { CustomFDC3Context } from '../PredefinedConfig/Common/FDC3Context';
+import { AdaptableApi, AdaptableIcon, ContextMenuContext, FDC3Context_DEPR, GridCell } from '../../types';
+import { CustomFDC3Context } from '../PredefinedConfig/Common/FDC3Context_DEPR';
 /**
  * Options required for when using the Finance plugin
  */
@@ -35,12 +35,12 @@ export interface FinancePluginOptions {
         /**
          * Custom FDC3 Intents
          */
-        customFDC3Intents?: CustomFDC3Intent[];
+        customFDC3Intents?: CustomFDC3Intent_Depr[];
     };
     /**
      * Intents to which to subscribe.
      */
-    availableFDC3Intents?: (FDC3Intent | CustomFDC3Intent)[];
+    availableFDC3Intents?: (FDC3Intent_Depr | CustomFDC3Intent_Depr)[];
     /**
      * Whether `FDC3MessageSent` Adaptable events should be automatically delegated to the FDC3 API (either via `fdc3.raiseIntent(...)` or `fdc3.broadcast(...)` )
      *
@@ -50,16 +50,16 @@ export interface FinancePluginOptions {
     /**
      * Called when an intent from `availableIntents` is raised.
      */
-    onFDC3Intent?: (intent: FDC3Intent | CustomFDC3Intent, context: FDC3Context, adaptableApi: AdaptableApi) => void;
+    onFDC3Intent?: (intent: FDC3Intent_Depr | CustomFDC3Intent_Depr, context: FDC3Context_DEPR, adaptableApi: AdaptableApi) => void;
     /**
      * Called when a context changes.
      */
-    onFDC3Context?: (context: FDC3Context, adaptableApi: AdaptableApi) => void;
+    onFDC3Context?: (context: FDC3Context_DEPR, adaptableApi: AdaptableApi) => void;
 }
 /**
  * An FDC3 Column - will raise FDC3 intents and broadcast FDC3 messages
  */
-export interface FDC3Column {
+export interface FDC3Column_Depr {
     /**
      * Id of Column defined as FDC3
      */
@@ -95,12 +95,12 @@ export interface FDC3Column {
     /**
      * Returns a custom icon to display in the Raise Intent Context Menu Item;
      */
-    intentIcon?: (intent: FDC3Intent | CustomFDC3Intent) => AdaptableIcon;
+    intentIcon?: (intent: FDC3Intent_Depr | CustomFDC3Intent_Depr) => AdaptableIcon;
 }
 /**
  * A Column which will be defined as an FDC3 Instrument
  */
-export interface InstrumentColumn extends FDC3Column {
+export interface InstrumentColumn extends FDC3Column_Depr {
     /**
      * Column which holds a ticker value as instrument data
      */
@@ -149,7 +149,7 @@ export declare type InstrumentIntent = 'ViewChart' | 'ViewQuote' | 'ViewNews' |
 /**
  *  A (Numeric) Column which will be defined as an FDC3 Position
  */
-export interface PositionColumn extends FDC3Column {
+export interface PositionColumn extends FDC3Column_Depr {
     /**
      * Column which contains the Instrument information of the FDC3 Message
      */
@@ -171,7 +171,7 @@ export declare type PositionIntent = 'ViewChart' | 'ViewNews' | 'ViewAnalysis';
  *  A (String) Column which will be defined as an FDC3 Contact
  *  columnId and at least one other property is required
  */
-export interface ContactColumn extends FDC3Column {
+export interface ContactColumn extends FDC3Column_Depr {
     /**
      * Column which holds the email address of a Contact
      */
@@ -196,7 +196,7 @@ export declare type ContactIntent = 'StartCall' | 'StartChat' | 'ViewContact';
 /**
  *  A (String) Column which will be defined as an FDC3 Organization
  */
-export interface OrganizationColumn extends FDC3Column {
+export interface OrganizationColumn extends FDC3Column_Depr {
     /**
      * Column which contains the LEI
      */
@@ -225,7 +225,7 @@ export declare type OrganizationIntent = 'ViewNews' | 'ViewAnalysis';
 /**
  *  A (String) Column which will be defined as an FDC3 Country
  */
-export interface CountryColumn extends FDC3Column {
+export interface CountryColumn extends FDC3Column_Depr {
     /**
      * Column which contains the ISOALPHA2 Standard
      */
@@ -250,11 +250,11 @@ export declare type CountryIntent = 'ViewChart';
 /**
  *  A Column which will be defined as Custom FDC3 (can be any datatype)
  */
-export interface CustomFDC3Column extends FDC3Column {
+export interface CustomFDC3Column extends FDC3Column_Depr {
     /**
      * Custom FDC3 Intents available to the column
      */
-    intents: CustomFDC3Intent[];
+    intents: CustomFDC3Intent_Depr[];
     /**
      * Function which creates FDC3 context for the current column and row
      */
@@ -263,11 +263,11 @@ export interface CustomFDC3Column extends FDC3Column {
 /**
  * Full list of FDC3 Intents available - each FDC3 Column can use a subset
  */
-export declare type FDC3Intent = 'StartCall' | 'StartChat' | 'ViewAnalysis' | 'ViewChart' | 'ViewContact' | 'ViewInstrument' | 'ViewNews' | 'ViewQuote';
+export declare type FDC3Intent_Depr = 'StartCall' | 'StartChat' | 'ViewAnalysis' | 'ViewChart' | 'ViewContact' | 'ViewInstrument' | 'ViewNews' | 'ViewQuote';
 /**
  * Custom FDC3 Intent - just a string value
  */
-export declare type CustomFDC3Intent = string;
+export declare type CustomFDC3Intent_Depr = string;
 /**
  * Context passed into Raise FDC3 Intent functions (e.g. get label)
  */
@@ -275,12 +275,12 @@ export interface RaiseFDC3IntentContext extends ContextMenuContext {
     /**
      * FDC3 Intent that was raised
      */
-    intent: FDC3Intent | CustomFDC3Intent;
+    intent: FDC3Intent_Depr | CustomFDC3Intent_Depr;
 }
 /**
  * Function that handles FDC3 Context
  */
-export declare type FDC3ContextHandler = (context: FDC3Context) => void;
+export declare type FDC3ContextHandler = (context: FDC3Context_DEPR) => void;
 /**
  * Defines a Desktop Agent which supports FDC3
  */
@@ -288,22 +288,22 @@ export interface FDC3DesktopAgent {
     /**
      * Raises an Intent
      */
-    raiseIntent: (intent: FDC3Intent, context: FDC3Context) => void;
+    raiseIntent: (intent: FDC3Intent_Depr, context: FDC3Context_DEPR) => void;
     /**
      * Broadcasts an FDC3 Message
      */
-    broadcast: (context: FDC3Context) => void;
+    broadcast: (context: FDC3Context_DEPR) => void;
     /**
      * Raises an FDC3 Intent for a given Context
      */
-    raiseIntentForContext: (context: FDC3Context) => void;
+    raiseIntentForContext: (context: FDC3Context_DEPR) => void;
     /**
      * Adds an FDC3 Intent Listener
      */
-    addIntentListener: (intent: FDC3Intent | CustomFDC3Intent, listener: (context: FDC3Context) => void) => void;
+    addIntentListener: (intent: FDC3Intent_Depr | CustomFDC3Intent_Depr, listener: (context: FDC3Context_DEPR) => void) => void;
     /**
-    * Adds an FDC3 Context Listener
-    */
+     * Adds an FDC3 Context Listener
+     */
     addContextListener: (contextType: string | null, handler: FDC3ContextHandler) => {
         unsubscribe: () => void;
     };

package/src/AdaptableOptions/GroupingOptions.d.ts

@@ -21,6 +21,14 @@ export interface GroupingOptions<TData = any> {
      * @noCodeItem
      */
     restoreUngroupedColumns?: boolean;
+    /**
+     * Order Row Grouped Columns automatically, using Adaptable State if available (Custom or Column Sort)
+     *
+     * @defaultValue true
+     * @gridInfoItem
+     * @noCodeItem
+     */
+    autoOrderGroupedColumns?: boolean;
 }
 /**
  * Context used when setting a value for Unbalanced Row Groups

package/src/AdaptableOptions/OpenFinPluginOptions.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
-import { AdaptableFDC3EventInfo } from '../PredefinedConfig/Common/FDC3Context';
+import { AdaptableFDC3EventInfo } from '../PredefinedConfig/Common/FDC3Context_DEPR';
 /**
  * Options required for when using the OpenFin plugin
  */

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -31,23 +31,23 @@ export interface UserInterfaceOptions<TData = any> {
      */
     dateInputOptions?: DateInputOptions;
     /**
-     * List of values which are permitted (e.g. to show in Filter, Custom Sort etc.)
+     * List of Column values to display (e.g. in Filter, Custom Sort etc.)
      */
     permittedValues?: PermittedValues<TData>[];
     /**
-     * Dropdown values displayed when column is being edited; when not defined defaults to permittedValues
+     * Dropdown values displayed when column is being edited
      */
     editLookUpItems?: EditLookUpPermittedValues<TData>[];
     /**
-     * Custom column values for 'IN' filter; when not defined defaults to permittedValues
+     * Custom column values for Values ('IN') Filter
      */
     filterPermittedValues?: FilterPermittedValues<TData>[];
     /**
-     * Custom column values for defining Custom Sort; when not defined defaults to permittedValues
+     * Custom column values for defining Custom Sort
      */
     customSortPermittedValues?: CustomSortPermittedValues<TData>[];
     /**
-     * Custom column values for editing via bulk-update; when not defined defaults to permittedValues
+     * Custom column values for editing via bulk-update
      */
     bulkUpdatePermittedValues?: BulkUpdatePermittedValues<TData>[];
     /**
@@ -92,7 +92,7 @@ export interface UserInterfaceOptions<TData = any> {
      */
     showAdapTableVersion?: boolean;
     /**
-     * English variant to use in UI labels
+     * English variant to use in AdapTable UI
      *
      * @defaultValue 'GB'
      * @gridInfoItem

package/src/Api/AdaptableApi.d.ts

@@ -41,6 +41,7 @@ import { StyledColumnApi } from './StyledColumnApi';
 import { OptionsApi } from './OptionsApi';
 import { ActionColumnApi } from './ActionColumnApi';
 import { ActionRowApi } from './ActionRowApi';
+import { Fdc3Api } from './Fdc3Api';
 /**
  *
  * The `AdaptableApi` provides developers with run-time access to AdapTable.
@@ -53,8 +54,8 @@ export interface AdaptableApi {
      */
     actionColumnApi: ActionColumnApi;
     /**
-   * Provides access to Action Rows
-   */
+     * Provides access to Action Rows
+     */
     actionRowApi: ActionRowApi;
     /**
      * Provides access to the Alert Module
@@ -220,6 +221,10 @@ export interface AdaptableApi {
      * Manages User Interface Options where colours, styles and permitted values are configured
      */
     userInterfaceApi: UserInterfaceApi;
+    /**
+     * Manages the FDC3 capabilities of AdapTable
+     */
+    fdc3Api: Fdc3Api;
     /**
      * Cleanup method - should be called only when using the vanilla javascript component, as framework components cleanup is performed when the component is destroyed/unmounted.
      * This destroys the Adaptable instance.

package/src/Api/ColumnApi.d.ts

@@ -243,11 +243,6 @@ export interface ColumnApi {
      * Retrieves current Primary Key Column in AdapTable
      */
     getPrimaryKeyColumn(): AdaptableColumn;
-    /**
-     * Checks if the Column with given ColumnId is an ActionRowButton column
-     * @param columnId ColumnId to Check
-     */
-    isActionRowButtonColumn(columnId: string): boolean;
     /**
      * Returns the default Aggregation Function for a Column
      * @param columnId Column to Check

package/src/Api/EventApi.d.ts

@@ -106,7 +106,7 @@ export interface EventApi {
      */
     off(eventName: 'SelectionChanged', callback: (selectionChangedInfo: SelectionChangedInfo) => void): void;
     /**
-     * Event fired whenever the **selected theme of AdapTable is changed**.
+     * Event fired whenever the selected theme of AdapTable is changed
      * @param eventName ThemeChanged
      * @param callback ThemeChangedInfo which just contains the name of the current Theme
      * @returns the unsubscribe function
@@ -117,9 +117,9 @@ export interface EventApi {
      */
     off(eventName: 'ThemeChanged', callback: (themeChangedInfo: ThemeChangedInfo) => void): void;
     /**
-     * Event fired whenever the a theme has been edited
+     * Event fired whenever a theme has been edited
      * @param eventName ThemeEdited
-     * @param callback ThemeChangedInfo which just contains the name of the current Theme
+     * @param callback ThemeEditedInfo which just contains the name of the current Theme
      * @returns the unsubscribe function
      */
     on(eventName: 'ThemeEdited', callback: (themeEditedInfo: ThemeEditedInfo) => void): VoidFunction;

package/src/Api/Events/ThemeChanged.d.ts

@@ -9,9 +9,3 @@ export interface ThemeChangedInfo extends BaseEventInfo {
      */
     theme: AdaptableTheme | string;
 }
-export interface ThemeEditedInfo extends BaseEventInfo {
-    /**
-     * The has been edited
-     */
-    theme: AdaptableTheme;
-}

package/src/Api/Events/ThemeEdited.d.ts

@@ -0,0 +1,11 @@
+import { AdaptableTheme } from '../../PredefinedConfig/ThemeState';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Object returned by the `ThemeEdited` event
+ */
+export interface ThemeEditedInfo extends BaseEventInfo {
+    /**
+     * Theme which has been edited
+     */
+    theme: AdaptableTheme;
+}