fix: Arguments of func visually not selected after tree loaded (#1086)

* fix

* chlog

* 6.6.2

Author: ukrbublik

CHANGELOG.md

@@ -1,10 +1,15 @@
 # Changelog
+- 6.6.2
+  - Fixed issue with rendering func select inside func (PR #1086) (issue #1085)
+  - Added `DefaultUtils` typings to `index.d.ts` (PR #1078) (issue #1079)
+  - Added config option `exportPreserveGroups` (PR #1077) (issue #1074)
 - 6.6.1
   - Operators reverse on "NOT" is now optional, disabled by default to preserve orignal query (PR #1068) (issue #1059).  
     Added settings `reverseOperatorsForNot` and `canShortMongoQuery`
   - Scope CSS classes to `.query-builder` (PR #1070) (issue #1018)
   - Update packages (PR #1071)
   - Fixed issue with `excludeOperators` (affects `prox1` at example) (PR #1072)
+  - Use pnpm 9 (PR #1073)
 - 6.6.0
   - Optimizations for rendering and export utils (PR #1054) (issue #342)
   - Added support of JsonLogic export for ternary mode (PR #1013) (issue #978)

lerna.json

@@ -4,5 +4,5 @@
     "./packages/*"
   ],
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.6.1"
+  "version": "6.6.2"
 }

packages/antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/antd",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. AntDesign widgets",
   "keywords": [
     "query-builder",

packages/bootstrap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/bootstrap",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Bootstrap widgets",
   "keywords": [
     "query-builder",

packages/core/modules/index.d.ts

@@ -720,7 +720,7 @@ export interface Actions {
   setFieldSrc(path: IdPath, fieldSrc: FieldSource): undefined;
   setOperator(path: IdPath, operator: string): undefined;
   setValue(path: IdPath, delta: number, value: RuleValueI, valueType: string): undefined; // todo: try to support RuleValue
-  setFuncValue(path: IdPath, delta: number, parentFuncs: string[], argKey: string | null, value: SimpleValue, valueType: string | "!valueSrc"): undefined;
+  setFuncValue(path: IdPath, delta: number, parentFuncs: Array<[string, string]>, argKey: string | null, value: SimpleValue, valueType: string | "!valueSrc"): undefined;
   setValueSrc(path: IdPath, delta: number, valueSrc: ValueSource): undefined;
   setOperatorOption(path: IdPath, name: string, value: SimpleValue): undefined;
   moveItem(fromPath: IdPath, toPath: IdPath, placement: Placement): undefined;
@@ -757,7 +757,7 @@ export interface TreeActions {
     setValue(config: Config, path: IdPath, delta: number, value: RuleValueI, valueType: string): InputAction; // todo: try to support RuleValue
     setValueSrc(config: Config, path: IdPath, delta: number, valueSrc: ValueSource): InputAction;
     setOperatorOption(config: Config, path: IdPath, name: string, value: SimpleValue): InputAction;
-    setFuncValue(config: Config, path: IdPath, delta: number, parentFuncs: string[], argKey: string | null, value: SimpleValue, valueType: string | "!valueSrc"): InputAction;
+    setFuncValue(config: Config, path: IdPath, delta: number, parentFuncs: Array<[string, string]>, argKey: string | null, value: SimpleValue, valueType: string | "!valueSrc"): InputAction;
   };
 }
 

packages/core/modules/utils/defaultUtils.js

@@ -3,7 +3,7 @@ import uuid from "./uuid";
 import {getFieldConfig, getOperatorConfig, getFieldParts, getFirstField} from "./configUtils";
 import {getFirstOperator} from "../utils/ruleUtils";
 import {getNewValueForFieldOp} from "../utils/validation";
-import { isImmutable } from "./stuff";
+import { isImmutable, isImmutableList } from "./stuff";
 import { jsToImmutable } from "../import";
 
 
@@ -149,14 +149,14 @@ export const defaultRoot = (config, canAddDefaultRule = true) => {
 };
 
 export const createListWithOneElement = (el) => {
-  if (isImmutable(el))
-    return el; // already Immutable
+  if (isImmutableList(el))
+    return el; // already Immutable list
   return createListFromArray([el]);
 };
 
 export const createListFromArray = (arr) => {
-  if (isImmutable(arr))
-    return arr; // already Immutable
+  if (isImmutableList(arr))
+    return arr; // already Immutable list
   return new Immutable.List(arr);
 };
 

packages/core/modules/utils/stuff.js

@@ -139,8 +139,12 @@ export const isImmutable = (v) => {
   return typeof v === "object" && v !== null && typeof v.toJS === "function";
 };
 
+export const isImmutableList = (v) => {
+  return isImmutable(v) && Immutable.isList(v); // Immutable.isIndexed(v)
+};
+
 export function toImmutableList(v) {
-  return (isImmutable(v) ? v : new Immutable.List(v));
+  return (isImmutableList(v) ? v : new Immutable.List(v));
 }
 
 export function applyToJS(v) {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/core",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Core",
   "keywords": [
     "query-builder",

packages/examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/examples",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "Local hot-reloadable demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",

packages/fluent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/fluent",
-  "version": "6.6.1",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Fluent 8 widgets",
   "keywords": [
     "query-builder",