Merge branch 'master' into rob/ecsql-tests

iTwin · Dec 17, 2024 · 70d1566 · 70d1566
2 parents 0d6c9b5 + 83c5b50
commit 70d1566
Show file tree

Hide file tree

Showing 56 changed files with 226 additions and 64 deletions.
diff --git a/common/api/core-frontend.api.md b/common/api/core-frontend.api.md
@@ -404,6 +404,7 @@ export class AccuDraw {
     deactivate(): void;
     // @internal (undocumented)
     decorate(context: DecorateContext): void;
+    defaultFocusItem(): ItemField;
     // @internal (undocumented)
     readonly delta: Vector3d;
     disableForSession(): void;

diff --git a/common/changes/@itwin/core-backend/2024-12-16-18-51.json b/common/changes/@itwin/core-backend/2024-12-16-18-51.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-backend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-backend"
+}
diff --git a/common/changes/@itwin/core-backend/2024-12-17-02-07.json b/common/changes/@itwin/core-backend/2024-12-17-02-07.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-backend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-backend"
+}
diff --git a/common/changes/@itwin/core-frontend/accudraw-lock-changed_2024-12-16-14-05.json b/common/changes/@itwin/core-frontend/accudraw-lock-changed_2024-12-16-14-05.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/core-frontend",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/core-frontend"
+}
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -2,7 +2,7 @@
   {
     "policyName": "prerelease-monorepo-lockStep",
     "definitionName": "lockStepVersion",
-    "version": "5.0.0-dev.25",
+    "version": "5.0.0-dev.26",
     "nextBump": "prerelease"
   }
 ]
diff --git a/core/backend/package.json b/core/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-backend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js backend components",
   "main": "lib/cjs/core-backend.js",
   "typings": "lib/cjs/core-backend",
@@ -99,7 +99,7 @@
     "webpack": "^5.97.1"
   },
   "dependencies": {
-    "@bentley/imodeljs-native": "5.0.17",
+    "@bentley/imodeljs-native": "5.0.19",
     "@itwin/cloud-agnostic-core": "^2.2.4",
     "@itwin/core-telemetry": "workspace:*",
     "@itwin/object-storage-azure": "^2.2.5",

diff --git a/core/bentley/package.json b/core/bentley/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-bentley",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "Bentley JavaScript core components",
   "main": "lib/cjs/core-bentley.js",
   "module": "lib/esm/core-bentley.js",

diff --git a/core/common/package.json b/core/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-common",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js components common to frontend and backend",
   "main": "lib/cjs/core-common.js",
   "module": "lib/esm/core-common.js",

diff --git a/core/ecschema-editing/package.json b/core/ecschema-editing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-editing",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "ECSchema editing and validation API",
   "license": "MIT",
   "main": "lib/cjs/ecschema-editing.js",

diff --git a/core/ecschema-locaters/package.json b/core/ecschema-locaters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-locaters",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "EC Schema file locaters",
   "license": "MIT",
   "main": "lib/cjs/ecschema-locaters.js",

diff --git a/core/ecschema-metadata/package.json b/core/ecschema-metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-metadata",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "ECObjects core concepts in typescript",
   "license": "MIT",
   "main": "lib/cjs/ecschema-metadata.js",

diff --git a/core/ecschema-rpc/common/package.json b/core/ecschema-rpc/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-rpcinterface-common",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "Schema RPC Interface common interface",
   "main": "lib/cjs/ecschema-rpc-interface.js",
   "module": "lib/esm/ecschema-rpc-interface.js",

diff --git a/core/ecschema-rpc/impl/package.json b/core/ecschema-rpc/impl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecschema-rpcinterface-impl",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "Schema RPC Interface backend implementation",
   "main": "lib/cjs/ecschema-rpc-impl.js",
   "typings": "lib/cjs/ecschema-rpc-impl",

diff --git a/core/ecsql/common/package.json b/core/ecsql/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/ecsql-common",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "ECSql component that can be reference on backend and frontend",
   "main": "lib/cjs/ecsql-common.js",
   "module": "lib/esm/ecsql-common.js",

diff --git a/core/electron/package.json b/core/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-electron",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js ElectronHost and ElectronApp",
   "license": "MIT",
   "engines": {

diff --git a/core/express-server/package.json b/core/express-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/express-server",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js express utilities",
   "main": "lib/cjs/ExpressServer.js",
   "typings": "lib/cjs/ExpressServer",

diff --git a/core/extension/package.json b/core/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-extension",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js Extension API",
   "type": "module",
   "typings": "index.d.ts",

diff --git a/core/frontend-devtools/package.json b/core/frontend-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/frontend-devtools",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "Debug menu and supporting UI widgets",
   "main": "lib/cjs/frontend-devtools.js",
   "module": "lib/esm/frontend-devtools.js",

diff --git a/core/frontend/package.json b/core/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-frontend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js frontend components",
   "main": "lib/cjs/core-frontend.js",
   "module": "lib/esm/core-frontend.js",

diff --git a/core/frontend/src/AccuDraw.ts b/core/frontend/src/AccuDraw.ts
@@ -292,8 +292,8 @@ export class AccuDraw {
   private readonly _angleRoundOff = new RoundOff(); // angle round off enabled and unit
   /** @internal */
   public readonly flags = new Flags(); // current state flags
-  private readonly _fieldLocked: boolean[] = []; // locked state of fields
-  private readonly _keyinStatus: KeyinStatus[] = []; // state of input field
+  private readonly _fieldLocked: [boolean, boolean, boolean, boolean, boolean] = [false, false, false, false, false]; // locked state of fields
+  private readonly _keyinStatus: [KeyinStatus, KeyinStatus, KeyinStatus, KeyinStatus, KeyinStatus] = [KeyinStatus.Dynamic, KeyinStatus.Dynamic, KeyinStatus.Dynamic, KeyinStatus.Dynamic, KeyinStatus.Dynamic]; // state of input field
   /** @internal */
   public readonly savedStateViewTool = new SavedState(); // Restore point for shortcuts/tools...
   /** @internal */
@@ -396,8 +396,12 @@ export class AccuDraw {
   /** @internal */
   public getKeyinStatus(index: ItemField): KeyinStatus { return this._keyinStatus[index]; }
 
-  /** Implement this method to set focus to the AccuDraw UI. */
+  /** Get whether AccuDraw currently has input focus */
+  public get hasInputFocus() { return true; }
+  /** Called to request input focus be set to AccuDraw. Focus is managed by AccuDraw UI. */
   public grabInputFocus() { }
+  /** Get default focus item for the current compass mode */
+  public defaultFocusItem(): ItemField { return (CompassMode.Polar === this.compassMode ? ItemField.DIST_Item : this.newFocus); }
 
   /** @internal */
   public activate(): void {
@@ -1093,7 +1097,9 @@ export class AccuDraw {
     return formattedValue;
   }
 
-  /** Can be called by sub-classes to get a formatted value to display for an AccuDraw input field */
+  /** Can be called by sub-classes to get a formatted value to display for an AccuDraw input field
+   * @see [[onFieldValueChange]]
+   */
   public getFormattedValueByIndex(index: ItemField): string {
     const value = IModelApp.accuDraw.getValueByIndex(index);
     if (ItemField.ANGLE_Item === index)
@@ -1175,7 +1181,7 @@ export class AccuDraw {
 
   /** @internal */
   public unlockAllFields(): void {
-    this.locked = 0;
+    this.locked = LockedStates.NONE_LOCKED;;
 
     if (CompassMode.Polar === this.compassMode) {
       if (this._fieldLocked[ItemField.DIST_Item])
@@ -1584,6 +1590,7 @@ export class AccuDraw {
 
   /** @internal */
   public changeCompassMode(animate: boolean = false): void {
+    this.unlockAllFields(); // Clear locks for the current mode and send change notifications...
     this.setCompassMode(CompassMode.Polar === this.compassMode ? CompassMode.Rectangular : CompassMode.Polar);
 
     const viewport = this.currentView;
@@ -2266,9 +2273,7 @@ export class AccuDraw {
   public onFieldLockChange(_index: ItemField) { }
   /** Called after input field value changes */
   public onFieldValueChange(_index: ItemField) { }
-  /** Whether AccuDraw currently has input focus */
-  public get hasInputFocus() { return true; }
-  /** Set focus to the specified input field */
+  /** Called to request focus change to the specified input field */
   public setFocusItem(_index: ItemField) { }
 
   private static getMinPolarMag(origin: Point3d): number {

diff --git a/core/geometry/package.json b/core/geometry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-geometry",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js Core Geometry library",
   "main": "lib/cjs/core-geometry.js",
   "module": "lib/esm/core-geometry.js",

diff --git a/core/hypermodeling/package.json b/core/hypermodeling/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/hypermodeling-frontend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js hypermodeling package",
   "main": "lib/cjs/hypermodeling-frontend.js",
   "module": "lib/esm/hypermodeling-frontend.js",

diff --git a/core/i18n/package.json b/core/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-i18n",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js localization code",
   "main": "lib/cjs/core-i18n.js",
   "module": "lib/esm/core-i18n.js",

diff --git a/core/markup/package.json b/core/markup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-markup",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js markup package",
   "main": "lib/cjs/core-markup.js",
   "module": "lib/esm/core-markup.js",

diff --git a/core/mobile/package.json b/core/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-mobile",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js MobileHost and MobileApp",
   "license": "MIT",
   "engines": {

diff --git a/core/orbitgt/package.json b/core/orbitgt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-orbitgt",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "",
   "main": "lib/cjs/core-orbitgt.js",
   "module": "lib/esm/core-orbitgt.js",

diff --git a/core/quantity/package.json b/core/quantity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-quantity",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "Quantity parsing, formatting and conversions for iModel.js",
   "main": "lib/cjs/core-quantity.js",
   "module": "lib/esm/core-quantity.js",

diff --git a/core/telemetry/package.json b/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/core-telemetry",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js Telemetry Client",
   "main": "lib/cjs/core-telemetry.js",
   "module": "lib/esm/core-telemetry.js",

diff --git a/core/webgl-compatibility/package.json b/core/webgl-compatibility/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/webgl-compatibility",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "APIs for determining the level of compatibility of a browser+device with the iTwin.js rendering system.",
   "license": "MIT",
   "main": "lib/cjs/webgl-compatibility.js",

diff --git a/domains/analytical/backend/package.json b/domains/analytical/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/analytical-backend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "main": "lib/cjs/analytical-backend.js",
   "typings": "lib/cjs/analytical-backend",
   "license": "MIT",

diff --git a/domains/linear-referencing/backend/package.json b/domains/linear-referencing/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/linear-referencing-backend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "main": "lib/cjs/linear-referencing-backend.js",
   "typings": "lib/cjs/linear-referencing-backend",
   "license": "MIT",

diff --git a/domains/linear-referencing/common/package.json b/domains/linear-referencing/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/linear-referencing-common",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "main": "lib/cjs/linear-referencing-common.js",
   "typings": "lib/cjs/linear-referencing-common",
   "license": "MIT",

diff --git a/domains/physical-material/backend/package.json b/domains/physical-material/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/physical-material-backend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "main": "lib/cjs/physical-material-backend.js",
   "typings": "lib/cjs/physical-material-backend",
   "license": "MIT",

diff --git a/editor/backend/package.json b/editor/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/editor-backend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js editor backend",
   "main": "lib/cjs/editor-backend.js",
   "typings": "lib/cjs/editor-backend",

diff --git a/editor/common/package.json b/editor/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/editor-common",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js editing properties common to frontend and backend",
   "main": "lib/cjs/editor-common.js",
   "module": "lib/esm/editor-common.js",

diff --git a/editor/frontend/package.json b/editor/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itwin/editor-frontend",
-  "version": "5.0.0-dev.25",
+  "version": "5.0.0-dev.26",
   "description": "iTwin.js frontend components",
   "main": "lib/cjs/editor-frontend.js",
   "module": "lib/esm/editor-frontend.js",