x4js 1.5.31 → 1.5.33

package/lib/types/datastore.d.ts

@@ -216,16 +216,16 @@ export interface DataProxyProps extends BaseComponentProps<DataEventMap> {
 }
 export declare class DataProxy extends BaseComponent<DataProxyProps, DataEventMap> {
     constructor(props: DataProxyProps);
-    load(url?: string): void;
-    private _refresh;
+    load(url?: string): Promise<void>;
 }
 /**
  *
  */
-interface DataStoreProps extends BaseComponentProps<DataStoreEventMap> {
-    model: Record;
-    data?: Record[];
+interface DataStoreProps<T extends Record> extends BaseComponentProps<DataStoreEventMap> {
+    model: T;
+    data?: T[];
     url?: string;
+    autoload?: false;
 }
 interface DataStoreEventMap extends EventMap {
     data_change: EvDataChange;
@@ -233,19 +233,19 @@ interface DataStoreEventMap extends EventMap {
 /**
  *
  */
-export declare class DataStore extends EventSource<DataStoreEventMap> {
-    protected m_model: Record;
+export declare class DataStore<T extends Record = Record> extends EventSource<DataStoreEventMap> {
+    protected m_model: T;
     protected m_fields: FieldInfo[];
-    protected m_records: Record[];
+    protected m_records: T[];
     protected m_proxy: DataProxy;
     protected m_rec_index: DataIndex;
-    constructor(props: DataStoreProps);
+    constructor(props: DataStoreProps<T>);
     /**
      *
      * @param records
      */
-    load(url?: string): void;
-    reload(): void;
+    load(url?: string): Promise<void>;
+    reload(): Promise<void>;
     /**
      * convert raw objects to real records from model
      * @param records
@@ -255,17 +255,17 @@ export declare class DataStore extends EventSource<DataStoreEventMap> {
      * just set the records
      * @param records - must be of the same type as model
      */
-    setRawData(records: any[]): void;
+    setRawData(records: T[]): void;
     private _rebuildIndex;
     /**
      *
      */
-    update(rec: Record): boolean;
+    update(rec: T): boolean;
     /**
      *
      * @param data
      */
-    append(rec: Record | any): void;
+    append(rec: T | any): void;
     /**
      *
      */
@@ -291,19 +291,19 @@ export declare class DataStore extends EventSource<DataStoreEventMap> {
      * return the record by it's id
      * @returns record or null
      */
-    getById(id: any): Record;
+    getById(id: any): T;
     /**
      * return a record by it's index
      * @returns record or null
      */
-    getByIndex(index: number): Record;
+    getByIndex(index: number): T;
     private _getRecord;
-    moveTo(other: DataStore): void;
+    moveTo(other: DataStore<T>): void;
     /**
      * create a new view on the DataStore
      * @param opts
      */
-    createView(opts?: DataViewProps): DataView;
+    createView(opts?: DataViewProps<T>): DataView<T>;
     /**
      *
      */
@@ -312,8 +312,8 @@ export declare class DataStore extends EventSource<DataStoreEventMap> {
     /**
      *
      */
-    forEach(cb: (rec: Record, index: number) => any): void;
-    export(): Record[];
+    forEach(cb: (rec: T, index: number) => any): void;
+    export(): T[];
     changed(): void;
 }
 export interface EvViewChange extends BasicEvent {
@@ -323,8 +323,8 @@ export declare function EvViewChange(action: 'filter' | 'sort' | 'change'): EvVi
 interface DataViewEventMap extends BaseComponentEventMap {
     view_change: EvViewChange;
 }
-interface DataViewProps extends BaseComponentProps<DataViewEventMap> {
-    store?: DataStore;
+interface DataViewProps<T extends Record> extends BaseComponentProps<DataViewEventMap> {
+    store?: DataStore<T>;
     filter?: FilterInfo;
     order?: string | SortProp[] | SortProp;
 }
@@ -344,12 +344,12 @@ export interface SortProp {
  * You can sort the columns & filter data
  * You can have multiple views for a single DataStore
  */
-export declare class DataView extends BaseComponent<DataViewProps, DataViewEventMap> {
+export declare class DataView<T extends Record = Record> extends BaseComponent<DataViewProps<T>, DataViewEventMap> {
     protected m_index: DataIndex;
-    protected m_store: DataStore;
+    protected m_store: DataStore<T>;
     protected m_sort: SortProp[];
     protected m_filter: FilterInfo;
-    constructor(props: DataViewProps);
+    constructor(props: DataViewProps<T>);
     private _storeChange;
     /**
      *
@@ -367,7 +367,7 @@ export declare class DataView extends BaseComponent<DataViewProps, DataViewEvent
     /**
      *
      */
-    get store(): DataStore;
+    get store(): DataStore<T>;
     /**
      *
      */
@@ -381,16 +381,16 @@ export declare class DataView extends BaseComponent<DataViewProps, DataViewEvent
      *
      * @param index
      */
-    getByIndex(index: number): Record;
+    getByIndex(index: number): T;
     /**
      *
      * @param id
      */
-    getById(id: any): Record;
+    getById(id: any): T;
     changed(): void;
     /**
      *
      */
-    forEach(cb: (rec: Record, index: number) => any): void;
+    forEach(cb: (rec: T, index: number) => any): void;
 }
 export {};

package/lib/types/icon.d.ts

@@ -28,6 +28,13 @@
 **/
 import { Component, CProps } from './component';
 import { BasicEvent } from './x4events';
+/**
+ * iconID can be:
+ * - "url( <path to image> )" ex: "url(my/path/to/my/image.svg)"
+ * - "var( <css variable> )"
+ * - "cls( <font class> )"
+ * - "char( <character> )" ex: "font-char( \uf00d )"
+ */
 export type IconID = string | number;
 export interface IconProps extends CProps {
     icon: IconID;

package/lib/types/sidebarview.d.ts

@@ -29,11 +29,13 @@
 import { Component } from './component';
 import { VLayout } from './layout';
 import { CardView, CardViewProps, ICardViewItem } from './cardview';
+import { Image } from './image';
 export interface SideBarItem extends ICardViewItem {
 }
 export interface SideBarProps extends CardViewProps {
     bar_sizable?: boolean;
     bar_width?: number;
+    logo?: Image;
 }
 /**
  *

package/lib/types/svgcomponent.d.ts

@@ -30,7 +30,7 @@ import { Component, CProps } from './component';
 /**
  *
  */
-declare abstract class SVGItem {
+export declare abstract class SVGItem {
     private m_tag;
     private m_attrs;
     private m_style;
@@ -87,18 +87,18 @@ declare abstract class SVGItem {
     /**
      *
      */
-    transform(tr: string): void;
+    transform(tr: string): this;
     /**
      *
      */
-    rotate(deg: number, cx: number, cy: number): void;
-    translate(dx: number, dy: number): void;
-    scale(x: number): void;
+    rotate(deg: number, cx: number, cy: number): this;
+    translate(dx: number, dy: number): this;
+    scale(x: number): this;
 }
 /**
  *
  */
-declare class SVGPath extends SVGItem {
+export declare class SVGPath extends SVGItem {
     private m_path;
     constructor();
     renderAttrs(): string;
@@ -134,7 +134,7 @@ declare class SVGPath extends SVGItem {
 /**
  *
  */
-declare class SVGText extends SVGItem {
+export declare class SVGText extends SVGItem {
     private m_text;
     constructor(x: number, y: number, txt: string);
     font(font: string): this;
@@ -147,14 +147,14 @@ declare class SVGText extends SVGItem {
 /**
  *
  */
-declare class SVGShape extends SVGItem {
+export declare class SVGShape extends SVGItem {
     constructor(tag: string);
 }
 /**
  *
  */
 type number_or_perc = number | `${string}%`;
-declare class SVGGradient extends SVGItem {
+export declare class SVGGradient extends SVGItem {
     private static g_id;
     private m_id;
     private m_stops;
@@ -166,13 +166,14 @@ declare class SVGGradient extends SVGItem {
 /**
  *
  */
-declare class SVGGroup extends SVGItem {
+export declare class SVGGroup extends SVGItem {
     protected m_items: SVGItem[];
     constructor(tag?: string);
     path(): SVGPath;
     text(x: any, y: any, txt: any): SVGText;
     ellipse(x: any, y: any, r1: any, r2?: any): SVGShape;
     rect(x: any, y: any, w: any, h: any): SVGShape;
+    group(): SVGGroup;
     /**
      *
      * example

package/lib/types/version.d.ts

@@ -26,4 +26,4 @@
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
-export declare const x4js_version = "1.5.31";
+export declare const x4js_version = "1.5.33";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x4js",
-	"version": "1.5.31",
+	"version": "1.5.33",
 	"description": "X4js core files",
 	"main": "lib/cjs/index.js",
 	"types": "lib/types/index.d.ts",