x4js 1.4.21 → 1.4.26

package/src/x4.less

@@ -70,7 +70,8 @@
 	--x4-icon-xmark: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" fill="currentColor"><path d="M310.6 361.4c12.5 12.5 12.5 32.75 0 45.25C304.4 412.9 296.2 416 288 416s-16.38-3.125-22.62-9.375L160 301.3L54.63 406.6C48.38 412.9 40.19 416 32 416S15.63 412.9 9.375 406.6c-12.5-12.5-12.5-32.75 0-45.25l105.4-105.4L9.375 150.6c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 210.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-105.4 105.4L310.6 361.4z"/></svg>';
 	--x4-icon-angle-down: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" fill="currentColor"><path d="M192 384c-8.188 0-16.38-3.125-22.62-9.375l-160-160c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L192 306.8l137.4-137.4c12.5-12.5 32.75-12.5 45.25 0s12.5 32.75 0 45.25l-160 160C208.4 380.9 200.2 384 192 384z"/></svg>';
 	--x4-icon-calendar-days: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" fill="currentColor"><path d="M160 32V64H288V32C288 14.33 302.3 0 320 0C337.7 0 352 14.33 352 32V64H400C426.5 64 448 85.49 448 112V160H0V112C0 85.49 21.49 64 48 64H96V32C96 14.33 110.3 0 128 0C145.7 0 160 14.33 160 32zM0 192H448V464C448 490.5 426.5 512 400 512H48C21.49 512 0 490.5 0 464V192zM64 304C64 312.8 71.16 320 80 320H112C120.8 320 128 312.8 128 304V272C128 263.2 120.8 256 112 256H80C71.16 256 64 263.2 64 272V304zM192 304C192 312.8 199.2 320 208 320H240C248.8 320 256 312.8 256 304V272C256 263.2 248.8 256 240 256H208C199.2 256 192 263.2 192 272V304zM336 256C327.2 256 320 263.2 320 272V304C320 312.8 327.2 320 336 320H368C376.8 320 384 312.8 384 304V272C384 263.2 376.8 256 368 256H336zM64 432C64 440.8 71.16 448 80 448H112C120.8 448 128 440.8 128 432V400C128 391.2 120.8 384 112 384H80C71.16 384 64 391.2 64 400V432zM208 384C199.2 384 192 391.2 192 400V432C192 440.8 199.2 448 208 448H240C248.8 448 256 440.8 256 432V400C256 391.2 248.8 384 240 384H208zM320 432C320 440.8 327.2 448 336 448H368C376.8 448 384 440.8 384 432V400C384 391.2 376.8 384 368 384H336C327.2 384 320 391.2 320 400V432z"/></svg>';
-	--x4-icon-tip: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"  fill="currentColor"><path d="M256 0C114.6 0 0 114.6 0 256s114.6 256 256 256s256-114.6 256-256S397.4 0 256 0zM256 464c-114.7 0-208-93.31-208-208S141.3 48 256 48s208 93.31 208 208S370.7 464 256 464zM296 336h-16V248C280 234.8 269.3 224 256 224H224C210.8 224 200 234.8 200 248S210.8 272 224 272h8v64h-16C202.8 336 192 346.8 192 360S202.8 384 216 384h80c13.25 0 24-10.75 24-24S309.3 336 296 336zM256 192c17.67 0 32-14.33 32-32c0-17.67-14.33-32-32-32S224 142.3 224 160C224 177.7 238.3 192 256 192z"/></svg>';
+	--x4-icon-tip: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" fill="currentColor"><path d="M256 0C114.6 0 0 114.6 0 256s114.6 256 256 256s256-114.6 256-256S397.4 0 256 0zM256 464c-114.7 0-208-93.31-208-208S141.3 48 256 48s208 93.31 208 208S370.7 464 256 464zM296 336h-16V248C280 234.8 269.3 224 256 224H224C210.8 224 200 234.8 200 248S210.8 272 224 272h8v64h-16C202.8 336 192 346.8 192 360S202.8 384 216 384h80c13.25 0 24-10.75 24-24S309.3 336 296 336zM256 192c17.67 0 32-14.33 32-32c0-17.67-14.33-32-32-32S224 142.3 224 160C224 177.7 238.3 192 256 192z"/></svg>';
+	--x4-check: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" fill="currentColor"><path d="M440.1 103C450.3 112.4 450.3 127.6 440.1 136.1L176.1 400.1C167.6 410.3 152.4 410.3 143 400.1L7.029 264.1C-2.343 255.6-2.343 240.4 7.029 231C16.4 221.7 31.6 221.7 40.97 231L160 350.1L407 103C416.4 93.66 431.6 93.66 440.1 103V103z"/></svg>';
 }
 
 @BLACK10:	rgba(0,0,0,0.1);
@@ -862,6 +863,10 @@ textarea {
 		width: 1em;
 		margin-right: 8px;
 		color: var( --gray-700 );
+
+		&.pop-mark {
+			height: 0.8em;
+		}
 	}
 
 	.x-label {
@@ -1329,9 +1334,12 @@ textarea {
 		overflow: hidden;
 		padding: 4px;
 		white-space: nowrap;
-		//min-width: 50px;
 		color: var( --gray-900 );
 		height: @def-height;
+
+		span {
+			width: 100%;
+		}
 	}
 
 	.x-footer,
@@ -1368,6 +1376,15 @@ textarea {
 		.x-cell {
 			display: flex;
 			align-items: center;
+			span {
+				width: unset;
+			}
+
+			.sort {
+				width: 1em;
+				height: 1em;
+				padding-left: 4px;
+			}
 		}
 	}
 
@@ -1441,6 +1458,8 @@ textarea {
 		border-right: 1px solid rgba(0,0,0,0.1);
     	border-bottom: 1px solid rgba(0,0,0,0.1);
 		height: 2em;
+		align-items: center;
+		display: flex;
 	}
 
 	.x-cell.x-selected {

package/tsconfig.json

@@ -12,12 +12,6 @@
 	"include": [
 		"./src/*",
 	],
-	"exclude": [
-		"src/hosts/nwjs_types.ts",
-		"src/hosts/nwjs.ts",
-		"src/texthiliter.ts",
-		"src/smartedit.ts"
-	],
 	"typedocOptions": {
         "entryPoints": ["src/index.ts"],
         "out": "../doc/api"

package/src/hosts/electron.ts

@@ -1,164 +0,0 @@
-/**
-* @file host/electron.ts
-* @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-import { x4document } from '../dom-gen'
-import { FileStat, PathType, PartType, Host } from './host'
-
-export * from './host';
-
-declare const require;
-declare const host_require;
-
-if( !globalThis.host_require ) {
-	globalThis.host_require = require;
-}
-
-export const fs 		= host_require( 'fs' );
-export const process 	= host_require( 'process' );
-export const electron  	= host_require( 'electron' );
-export const path  		= host_require( 'path' );
-
-//import * as path from 'node:path';	
-
-export class ElectronHost extends Host {
-
-	makePath( ...els: string[] ) {
-		return path.join( ...els );
-	}
-
-	readBinary( path: string ): Promise<Uint8Array> {
-		return new Promise( ( resolve, reject ) => {
-			fs.readFile( path, ( err, buff ) => {
-				if( err ) { reject( err ); }
-				else { resolve( buff ); }
-			} );
-		} );
-	}
-
-	writeBinary( path: string, data: Uint8Array ): Promise<boolean> {
-		return new Promise( ( resolve, reject ) => {
-			fs.writeFile( path, data, ( err ) => {
-				if( err ) { reject(err); }
-				else { resolve( true ); }
-			} );
-		} );
-	}
-
-	readUtf8( path: string ): Promise<string> {
-		return new Promise( ( resolve, reject ) => {
-			fs.readFile( path, { encoding: 'utf8' }, ( err, buff ) => {
-				if( err ) { reject( err ); }
-				else { resolve( buff.toString() ); }
-			} );
-		} );
-	}
-
-	writeUtf8( path: string, data: string ): Promise<boolean> {
-		return new Promise( ( resolve, reject ) => {
-			fs.writeFile( path, data, {encoding: 'utf8'}, ( err ) => {
-				if( err ) { reject(err); }
-				else { resolve( true ); }
-			} );
-		} );
-	}
-
-	compress( data: Uint8Array ): Promise<Uint8Array> {
-		return new Promise( (resolve, reject ) => {
-			let zlib = this.require('zlib');
-			zlib.gzip( data, ( err, Uint8Array ) => {
-				if( err ) { reject( err); }
-				else { resolve( Uint8Array); }
-			} );
-		} );
-	}
-
-	decompress( data: Uint8Array ): Promise<Uint8Array> {
-		return new Promise( (resolve, reject ) => {
-			let zlib = this.require('zlib');
-			zlib.gunzip( data, ( err, Uint8Array ) => {
-				if( err ) { reject( err); }
-				else { resolve( Uint8Array); }
-			} );
-		} );
-	}
-
-	readLocalStorage( name: string ): string {
-		return localStorage.getItem( name );
-	}
-
-	writeLocalStorage( name: string, data: string ): void {
-		localStorage.setItem( name, data );
-	}
-
-	stat( name: string ): FileStat {
-		let stat = fs.statSync( name );
-		if( !stat ) {
-			return null;
-		}
-
-		return {
-			atime: stat.atimeMs,
-			isDir: stat.isDirectory()
-		}
-	}
-
-	readDir( path: string ): Promise<string[]> {
-		return new Promise( ( resolve, reject ) => {
-			fs.readdir( path, ( err, files ) => {
-				if( err ) { reject(err); }
-				else { resolve(files); }
-			});		
-		});
-	}	
-
-	require( name: string ): any {
-		return host_require( name );
-	} 
-
-	cwd( ): string {
-		return process.cwd( );
-	}
-
-	get ipc( ) {
-		return electron.ipcRenderer;
-	}
-
-	getPath( type: PathType ) : string {
-		return this.ipc.sendSync( 'getPath', type );
-	}
-
-	getPathPart( pth: string, type: PartType ) : string {
-	
-		let els = path.parse( pth );
-		switch ( type ) {
-			case 'dirname': return els.dir;
-			case 'basename': return els.base;
-			case 'filename': return els.name;
-			case 'extname': return els.ext;
-		}
-		
-		return '';
-	}
-
-	createCanvas = ( ) => {
-		return x4document.createElement('canvas');
-	}
-}
-
-new ElectronHost( );

package/src/hosts/host.ts

@@ -1,100 +0,0 @@
-/**
-* @file host.ts
-* @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-export interface FileStat {
-	atime: number;
-	isDir: boolean;
-}
-
-export type PathType = 'home' | 'appData' | 'userData' | 'cache' | 'temp' | 'exe' | 'desktop' | 'documents' | 'downloads' | 'music'
-						| 'pictures'| 'videos' | 'recent' | 'logs' | 'crashDumps';
-
-export type PartType = 'filename' | 'extname' | 'basename' | 'dirname';
-
-export abstract class Host {
-
-	constructor( ) {
-		host = this;
-	}
-
-	makePath( ...els: string[] ) {
-		return els.join( '/' );
-	}
-
-	readBinary( path: string ): Promise<Uint8Array> {
-		return Promise.reject( 'not imp' );	
-	}
-
-	writeBinary( path: string, data: Uint8Array ): Promise<boolean> {
-		return Promise.reject( 'not imp' );
-	}
-
-	readUtf8( path: string ): Promise<string> {
-		return Promise.reject( 'not imp' );
-	}
-
-	writeUtf8( path: string, data: string ): Promise<boolean> {
-		return Promise.reject( 'not imp' );
-	}
-
-	compress( data: Uint8Array ): Promise<Uint8Array> {
-		return Promise.reject( 'not imp' );
-	}
-
-	decompress( data: Uint8Array ): Promise<Uint8Array> {
-		return Promise.reject( 'not imp' );
-	}
-
-	readLocalStorage( name: string ): string {
-		return localStorage.getItem( name );
-	}
-
-	writeLocalStorage( name: string, data: string ): void {
-		localStorage.setItem( name, data );
-	}
-
-	stat( name: string ): FileStat {
-		throw 'not imp';
-	}
-
-	readDir( path: string ): Promise<string[]> {
-		throw 'not imp';
-	}
-
-	require( name: string ): any {
-		throw 'not imp';
-	}
-
-	cwd( ): string {
-		throw 'not imp';
-	}
-
-	getPath( type: PathType ) : string {
-		throw 'not imp';
-	}
-
-	getPathPart( path: string, type: PartType ) : string {
-		throw 'not imp';
-	}
-
-	abstract createCanvas( );
-}
-
-
-export let host: Host = null;

package/src/hosts/nwjs.ts

@@ -1,141 +0,0 @@
-/**
-* @file host/nwjs.ts
-* @author Etienne Cochard 
-* @license
-* Copyright (c) 2019-2021 R-libre ingenierie
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
-**/
-
-import { FileStat, PathType, Host } from './host'
-
-export * from './host';
-
-// to deal with amd modules (that are not comletely compatible with nodejs)
-// globalThis.node_require must be set to require BEFORE polyfill code of amd module.
-// ie. globalThis.node_require = require;
-
-declare const host_require;
-if( !globalThis.host_require ) {
-	globalThis.host_require = require;
-}
-
-const fs = host_require( 'fs' );
-const process = host_require( 'process' );
-const path  	= host_require( 'path' );
-
-
-
-export class NWJSHost implements Host {
-
-	makePath( ...els: string[] ) {
-		return path.join( ...els );
-	}
-
-	readBinary( path: string ): Promise<Uint8Array> {
-		return new Promise( ( resolve, reject ) => {
-			fs.readFile( path, ( err, buff ) => {
-				if( err ) { reject( err ); }
-				else { resolve( buff ); }
-			} );
-		} );
-	}
-
-	writeBinary( path: string, data: Uint8Array ): Promise<boolean> {
-		return new Promise( ( resolve, reject ) => {
-			fs.writeFile( path, data, ( err ) => {
-				if( err ) { reject(err); }
-				else { resolve( true ); }
-			} );
-		} );
-	}
-
-	readUtf8( path: string ): Promise<string> {
-		return new Promise( ( resolve, reject ) => {
-			fs.readFile( path, { encoding: 'utf8' }, ( err, buff ) => {
-				if( err ) { reject( err ); }
-				else { resolve( buff.toString() ); }
-			} );
-		} );
-	}
-
-	writeUtf8( path: string, data: string ): Promise<boolean> {
-		return new Promise( ( resolve, reject ) => {
-			fs.writeFile( path, data, {encoding: 'utf8'}, ( err ) => {
-				if( err ) { reject(err); }
-				else { resolve( true ); }
-			} );
-		} );
-	}
-
-	compress( data: Uint8Array ): Promise<Uint8Array> {
-		return new Promise( (resolve, reject ) => {
-			let zlib = host_require('zlib');
-			zlib.gzip( data, ( err, Uint8Array ) => {
-				if( err ) { reject( err); }
-				else { resolve( Uint8Array); }
-			} );
-		} );
-	}
-
-	decompress( data: Uint8Array ): Promise<Uint8Array> {
-		return new Promise( (resolve, reject ) => {
-			let zlib = host_require('zlib');
-			zlib.gunzip( data, ( err, Uint8Array ) => {
-				if( err ) { reject( err); }
-				else { resolve( Uint8Array); }
-			} );
-		} );
-	}
-
-	readLocalStorage( name: string ): string {
-		return localStorage.getItem( name );
-	}
-
-	writeLocalStorage( name: string, data: string ): void {
-		localStorage.setItem( name, data );
-	}
-
-	stat( name: string ): FileStat {
-		let stat = fs.statSync( name );
-		if( !stat ) {
-			return null;
-		}
-
-		return {
-			atime: stat.atimeMs
-		}
-	}
-
-	readDir( path: string ): Promise<string[]> {
-		return new Promise( ( resolve, reject ) => {
-			fs.readdir( path, ( err, files ) => {
-				if( err ) { reject(err); }
-				else { resolve(files); }
-			});		
-		});
-	}	
-
-	require( name: string ): any {
-		// your amd module must define window.node_require = require;
-		return host_require( name );
-	} 
-
-	cwd( ): string {
-		return process.cwd( );
-	}
-
-	getPath( type: PathType ) : string {
-		throw 'not imp';
-	}
-}