x4js 1.5.4 → 1.5.5

package/lib/cjs/version.js

@@ -29,4 +29,4 @@
 **/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x4js_version = void 0;
-exports.x4js_version = "1.5.2";
+exports.x4js_version = "1.5.5";

package/lib/esm/version.js

@@ -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 const x4js_version = "1.5.2";
+export const x4js_version = "1.5.5";

package/lib/src/gridview.ts

@@ -40,7 +40,7 @@ import { HLayout, VLayout } from './layout'
 import { Component, ContainerEventMap, EvSize, EvDblClick, CProps, flyWrap, html, HtmlString, SizerOverlay, Flex } from './component'
 import { Label } from './label'
 import { _tr } from './i18n'
-import * as Formatters from './formatters'
+import { FormatFunc } from './formatters'
 import { downloadData, isFunction } from './tools'
 import { DataView, DataStore, Record } from './datastore'
 
@@ -71,7 +71,7 @@ export interface GridColumn {
 	flex?: number;
 	align?: 'left' | 'center' | 'right';
 	renderer?: CellRenderer;
-	formatter?: Formatters.FormatFunc;
+	formatter?: FormatFunc;
 	cls?: string;
 	sortable?: boolean;
 }

package/lib/src/radiobtn.ts

@@ -28,6 +28,7 @@
 **/
 
 import { x4document } from './x4dom'
+import { HtmlString } from './tools'
 
 import { Component, CProps, CEventMap } from './component'
 import { EvChange, EventCallback } from './x4events'
@@ -185,11 +186,11 @@ export class RadioBtn extends Component<RadioBtnProps,RadioBtnEventMap> {
 		}
 	}
 
-	get text( ) {
+	get text( ): HtmlString | string {
 		return this.itemWithRef<Label>('label').text;
 	}
 
-	set text( text ) {
+	set text( text: HtmlString | string ) {
 		this.itemWithRef<Label>('label').text = text;
 	}
 }

package/lib/src/spreadsheet.ts

@@ -33,7 +33,7 @@ import { Component, SizerOverlay, EvDblClick, EvSize, ContainerEventMap, Contain
 import { Input, InputProps } from './input';
 import { HLayout, VLayout } from './layout';
 import { TextEditProps, TextEdit } from './textedit';
-import * as Formatters from './formatters';
+import { FormatFunc } from './formatters'
 import { asap, parseIntlFloat } from './tools';
 import { deferCall } from './tools';
 import { EvContextMenu, EvChange, EvSelectionChange, EventCallback } from './x4events'
@@ -56,7 +56,7 @@ export interface ColProp {
 	align?: string;
 	cls?: string;
 	min_width?: number;
-	renderer?: Formatters.FormatFunc;
+	renderer?: FormatFunc;
 	createEditor?: EditorFactory;		// null => disable edition
 }
 

package/lib/src/tabbar.ts

@@ -145,7 +145,7 @@ export class TabBar extends Container<TabBarProps,TabBarEventMap> {
 		}
 	}
 
-	get selection( ) {
+	get selection( ): Component {
 		return this.m_curPage?.page;
 	}
 }

package/lib/src/textedit.ts

@@ -30,7 +30,7 @@
 import { x4document } from './x4dom'
 
 import { Component, EvFocus, HtmlString } from './component'
-import { Input, InputProps, InputEventMap } from './input'
+import { Input, InputProps, InputEventMap, EditType } from './input'
 import { IconID } from './icon'
 import { Button } from './button'
 import { HLayout } from './layout'
@@ -538,7 +538,7 @@ export class TextEdit<T extends TextEditProps = TextEditProps, E extends TextEdi
 		return this.m_ui_input;
 	}
 
-	get type() {
+	get type(): EditType {
 		return this.m_props.type;
 	}
 }

package/lib/src/version.ts

@@ -27,4 +27,4 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
 
-export const x4js_version = "1.5.2";
+export const x4js_version = "1.5.5";

package/lib/types/gridview.d.ts

@@ -29,7 +29,7 @@
 import { VLayout } from './layout';
 import { Component, ContainerEventMap, EvDblClick, CProps, HtmlString } from './component';
 import { Label } from './label';
-import * as Formatters from './formatters';
+import { FormatFunc } from './formatters';
 import { DataView, DataStore, Record } from './datastore';
 import { EvContextMenu, EvSelectionChange, BasicEvent, EventDisposer } from "./x4events";
 export interface EvGridCheck extends BasicEvent {
@@ -47,7 +47,7 @@ export interface GridColumn {
     flex?: number;
     align?: 'left' | 'center' | 'right';
     renderer?: CellRenderer;
-    formatter?: Formatters.FormatFunc;
+    formatter?: FormatFunc;
     cls?: string;
     sortable?: boolean;
 }

package/lib/types/radiobtn.d.ts

@@ -26,6 +26,7 @@
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
+import { HtmlString } from './tools';
 import { Component, CProps, CEventMap } from './component';
 import { EvChange, EventCallback } from './x4events';
 import { IconID } from './icon';
@@ -66,7 +67,7 @@ export declare class RadioBtn extends Component<RadioBtnProps, RadioBtnEventMap>
      * @param {boolean} ck new checked value
      */
     set check(ck: boolean);
-    get text(): string | import("./tools").HtmlString;
-    set text(text: string | import("./tools").HtmlString);
+    get text(): HtmlString | string;
+    set text(text: HtmlString | string);
 }
 export {};

package/lib/types/spreadsheet.d.ts

@@ -29,7 +29,7 @@
 import { Component, EvDblClick, ContainerEventMap, ContainerProps } from './component';
 import { InputProps } from './input';
 import { VLayout } from './layout';
-import * as Formatters from './formatters';
+import { FormatFunc } from './formatters';
 import { EvContextMenu, EvChange, EvSelectionChange, EventCallback } from './x4events';
 export interface EditorFactory {
     (props: InputProps, row: number, col: number): Component;
@@ -44,7 +44,7 @@ export interface ColProp {
     align?: string;
     cls?: string;
     min_width?: number;
-    renderer?: Formatters.FormatFunc;
+    renderer?: FormatFunc;
     createEditor?: EditorFactory;
 }
 /**

package/lib/types/tabbar.d.ts

@@ -53,6 +53,6 @@ export declare class TabBar extends Container<TabBarProps, TabBarEventMap> {
     render(): void;
     select(id: string | null, notify?: boolean): boolean;
     private _select;
-    get selection(): Component<CProps<import("./component").CEventMap>, import("./component").CEventMap>;
+    get selection(): Component;
 }
 export {};

package/lib/types/textedit.d.ts

@@ -27,7 +27,7 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
 import { Component, EvFocus, HtmlString } from './component';
-import { Input, InputProps, InputEventMap } from './input';
+import { Input, InputProps, InputEventMap, EditType } from './input';
 import { IconID } from './icon';
 import { EvClick, EvChange, EventCallback } from './x4events';
 type ValidationFunction = (value: string) => string;
@@ -118,6 +118,6 @@ export declare class TextEdit<T extends TextEditProps = TextEditProps, E extends
     _date_validator(value: string): string;
     private _showDatePicker;
     get input(): Input;
-    get type(): import("./input").EditType;
+    get type(): EditType;
 }
 export {};

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.2";
+export declare const x4js_version = "1.5.5";

package/package.json

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