inviton-powerduck 0.0.129 → 0.0.130

package/common/localized-value-helper.ts

@@ -38,7 +38,10 @@ export default class LocalizedValueHelper {
 		}
 
 		for (const propKey in value) {
-			return value[propKey];
+			const val = value[propKey];
+			if (val?.length > 0) {
+				return val;
+			}
 		}
 
 		return null as any;

package/components/datatable/datatable.tsx

@@ -891,7 +891,7 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
 		}
 	}
 
-	markSelection(): void {
+	markSelection (): void {
 		const mySelf = this;
 		const escapeRegExp = function (string) {
 			return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
@@ -909,26 +909,55 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
 		};
 
 		let regexBuilder = '';
-		const markArr: string[] = [];
+		const markArr = [];
 		if (this.filterArr != null) {
 			this.filterArr.forEach((filterItem) => {
 				if (regexBuilder.length > 0) {
 					regexBuilder += '|';
 				}
 
+				const columnId = filterItem.PropertyName?.toLowerCase();
+				const tds = Array.from($(mySelf.$el).find(`td.dt-col-${columnId}`));
+				if (tds == null || tds.length == 0) {
+					return;
+				}
+
 				(getValueArr(filterItem) || []).forEach((filterValue) => {
-					markArr.push(escapeRegExp(filterValue));
+					markArr.push({
+						value: escapeRegExp(filterValue),
+						elements: tds,
+					});
 				});
 			});
 		}
 
 		if (!isNullOrEmpty(this.fullTextQuery)) {
-			regexBuilder += escapeRegExp(this.fullTextQuery);
+			const value = escapeRegExp(this.fullTextQuery);
+			const tds = Array.from($(mySelf.$el).find(`td`));
+			regexBuilder += value;
+
+			markArr.push({
+				value,
+				elements: tds,
+			});
 		}
 
 		if (DataTableConfig.filterMarking) {
 			this.unmarkSelection(() => {
-				mySelf.markInstance.mark(markArr);
+				for (const item of markArr) {
+					this.markInstance.mark(item.value, {
+						filter: (node) => {
+							const parentTd = $(node).closest('td')[0];
+							if (!parentTd) {
+								return false;
+							}
+
+							const matchesColumn = item.elements?.some(el => parentTd?.isEqualNode(el));
+							const matchesText = parentTd?.textContent?.toLowerCase().includes(item.value.toLowerCase());
+							return matchesColumn && matchesText;
+						}
+					});
+				}
 			});
 		}
 	}

package/components/input/localized-string-wysiwyg.tsx

@@ -40,6 +40,7 @@ class LocalizedStringWysiwigComponent extends TsxComponent<LocalizedStringInputA
 	@Prop() appendClicked: () => void;
 	@Prop() prependClicked: () => void;
 	currentValue: ILocalizedText = null;
+	editorHeight: number = null;
 
 	raiseChangeEvent(newValue: ILocalizedText): void {
 		this.populateValidationDeclaration();
@@ -59,6 +60,10 @@ class LocalizedStringWysiwigComponent extends TsxComponent<LocalizedStringInputA
 		this.raiseChangeEvent(value);
 	}
 
+	onEditorResized (height: number): void {
+		this.editorHeight = height;
+	}
+
 	getActualValue(lang: Language, value: ILocalizedText): string {
 		if (value == null) {
 			return null;
@@ -104,6 +109,8 @@ class LocalizedStringWysiwigComponent extends TsxComponent<LocalizedStringInputA
 								key={lang.id}
 								wrap={false}
 								resizable={this.resizable}
+								initialHeight={this.editorHeight}
+								onResized={this.onEditorResized}
 								label={null}
 								value={this.getActualValue(lang.id, this.value)}
 								changed={(e) => {

package/components/input/wysiwig.tsx

@@ -32,6 +32,8 @@ interface WysiwigEditorArgs extends FormItemWrapperArgs {
 	useCommonUpload?: boolean;
 	uploadPluginArgs?: () => any | any;
 	resizable?: boolean;
+	initialHeight?: number;
+	onResized?: (height: number) => void;
 	changed: (newValue: string) => void;
 }
 
@@ -56,6 +58,8 @@ class WysiwigEditorComponent extends TsxComponent<WysiwigEditorArgs> implements
 	@Prop() appendClicked: () => void;
 	@Prop() prependClicked: () => void;
 	@Prop() changed: (newValue: string) => void;
+	@Prop() initialHeight: number = null;
+	@Prop() onResized?: (height: number) => void;
 	@Prop({ default: true }) resizable: boolean;
 	skipTrigger: boolean = false;
 
@@ -160,6 +164,25 @@ class WysiwigEditorComponent extends TsxComponent<WysiwigEditorArgs> implements
 			innerEditor.addClass('vertical-resize');
 		}
 
+		if (this.initialHeight) {
+			innerEditor.css('height', `${this.initialHeight}px`);
+		}
+
+		let lastNotifiedHeight = this.initialHeight || null;
+		if (this.onResized != null && this.resizable) {
+			const resizeObserver = new ResizeObserver((entries) => {
+				for (const entry of entries) {
+					const height = entry?.contentRect?.height;
+					if (height > 0 && (lastNotifiedHeight == null || Math.abs(height - lastNotifiedHeight) > 2)) { // To keep height stable
+						lastNotifiedHeight = height;
+						this.onResized(height);
+					}
+				}
+			});
+
+			resizeObserver.observe(innerEditor[0]);
+		}
+
 		innerEditor.on('click', (e) => {
 			const clickTarget = e.target;
 			if (clickTarget != null && clickTarget.nodeName == 'IMG') {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "inviton-powerduck",
 	"type": "module",
-	"version": "0.0.129",
+	"version": "0.0.130",
 	"files": [
 		"app/",
 		"common/",