@itwin/appui-react 4.1.0 → 4.2.0-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/appui-react",
-  "version": "4.1.0",
+  "version": "4.2.0-dev.1",
   "description": "UI framework",
   "main": "lib/cjs/appui-react.js",
   "module": "lib/esm/appui-react.js",
@@ -23,16 +23,16 @@
   },
   "peerDependencies": {
     "@itwin/appui-abstract": "^3.7.0 || ^4.0.0",
-    "@itwin/appui-layout-react": "^4.1.0",
-    "@itwin/components-react": "^4.1.0",
+    "@itwin/appui-layout-react": "^4.2.0-dev.1",
+    "@itwin/components-react": "^4.2.0-dev.1",
     "@itwin/core-bentley": "^3.7.0 || ^4.0.0",
     "@itwin/core-common": "^3.7.0 || ^4.0.0",
     "@itwin/core-frontend": "^3.7.0 || ^4.0.0",
     "@itwin/core-geometry": "^3.7.0 || ^4.0.0",
     "@itwin/core-quantity": "^3.7.0 || ^4.0.0",
-    "@itwin/core-react": "^4.1.0",
+    "@itwin/core-react": "^4.2.0-dev.1",
     "@itwin/core-telemetry": "^3.7.0 || ^4.0.0",
-    "@itwin/imodel-components-react": "^4.1.0",
+    "@itwin/imodel-components-react": "^4.2.0-dev.1",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
     "react-redux": "^7.2.2",
@@ -44,20 +44,20 @@
   ],
   "devDependencies": {
     "@itwin/appui-abstract": "^3.7.0",
-    "@itwin/appui-layout-react": "4.1.0",
+    "@itwin/appui-layout-react": "4.2.0-dev.1",
     "@itwin/build-tools": "^3.7.0",
-    "@itwin/components-react": "4.1.0",
+    "@itwin/components-react": "4.2.0-dev.1",
     "@itwin/core-bentley": "^3.7.0",
     "@itwin/core-common": "^3.7.0",
     "@itwin/core-frontend": "^3.7.0",
     "@itwin/core-geometry": "^3.7.0",
     "@itwin/core-orbitgt": "^3.7.0",
     "@itwin/core-quantity": "^3.7.0",
-    "@itwin/core-react": "4.1.0",
+    "@itwin/core-react": "4.2.0-dev.1",
     "@itwin/core-telemetry": "^3.7.0",
     "@itwin/ecschema-metadata": "^3.7.0",
     "@itwin/eslint-plugin": "^3.7.0",
-    "@itwin/imodel-components-react": "4.1.0",
+    "@itwin/imodel-components-react": "4.2.0-dev.1",
     "@itwin/webgl-compatibility": "^3.7.0",
     "@testing-library/dom": "^8.11.2",
     "@testing-library/react": "^12.0.0",
@@ -99,7 +99,9 @@
     "sinon-chai": "^3.2.0",
     "ts-node": "^10.8.2",
     "typemoq": "^2.1.0",
-    "typescript": "~5.0.2"
+    "typescript": "~5.0.2",
+    "eslint-config-prettier": "~8.8.0",
+    "@rushstack/eslint-patch": "^1.3.0"
   },
   "//dependencies": [
     "NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API",
@@ -107,7 +109,7 @@
   ],
   "dependencies": {
     "@bentley/icons-generic": "^1.0.34",
-    "@itwin/itwinui-react": "^2.5.0",
+    "@itwin/itwinui-react": "^2.11.6",
     "@itwin/itwinui-variables": "^2.0.0",
     "@itwin/itwinui-icons-react": "^2.1.0",
     "@itwin/itwinui-icons": "^1.14.0",
@@ -132,29 +134,14 @@
     "functions": 90,
     "lines": 90
   },
-  "eslintConfig": {
-    "rules": {
-      "@typescript-eslint/consistent-type-imports": "error",
-      "no-duplicate-imports": "off"
-    },
-    "plugins": [
-      "@itwin"
-    ],
-    "extends": [
-      "plugin:@itwin/ui",
-      "plugin:@itwin/jsdoc"
-    ]
-  },
   "scripts": {
+    "start": "run-p -l \"build:** -- -w\" \"copy:** -- -w\"",
     "build": "npm run -s copy:locale && npm run -s build:cjs && npm run -s build:esm",
     "build:cjs": "npm run -s copy:cjs && tsc -p tsconfig.cjs.json",
     "build:esm": "npm run -s copy:esm && tsc -p tsconfig.esm.json",
-    "build:watch": "run-p watch:cjs watch:esm",
-    "watch:cjs": "npm run -s build:cjs -- -w",
-    "watch:esm": "npm run -s build:esm -- -w",
-    "copy:locale": "cpx \"./public/**/*\" ./lib/public",
     "copy:cjs": "cpx \"./src/**/*.{*css,json,svg}\" \"./lib/cjs\"",
     "copy:esm": "cpx \"./src/**/*.{*css,json,svg}\" \"./lib/esm\"",
+    "copy:locale": "cpx \"./public/**/*\" ./lib/public",
     "pseudolocalize": "betools pseudolocalize --englishDir ./public/locales/en --out ./public/locales/en-PSEUDO",
     "clean": "rimraf lib .rush/temp/package-deps*.json",
     "cover": "nyc npm -s test",
@@ -168,5 +155,5 @@
     "docs:reference": "betools docs --includes=../../generated-docs/extract --json=../../generated-docs/reference/appui-react/file.json --excludeGlob=**/declarations.d.ts --tsIndexFile=./appui-react.ts --onlyJson",
     "docs:extract": "betools extract --fileExt=ts,tsx --extractFrom=./src/test --recursive --out=../../generated-docs/extract"
   },
-  "readme": "# @itwin/appui-react\r\n\r\nCopyright © Bentley Systems, Incorporated. All rights reserved. See LICENSE.md for license terms and full copyright notice.\r\n\r\n## Description\r\n\r\nThe __@itwin/appui-react__ package contains application fragments for View selection, and configuration of the application UI including the Backstage, Frontstages, Widgets, etc.\r\n\r\nThe AppUI React package is a portion of the iTwin.js User Interface library. It consists of major fragments of code that combine the\r\nfunctionality from the `@itwin/core-frontend` with the core-react, imodel-components and appui-layout-react packages to implement substantial\r\nfunctionality that can be used within an iTwin.js application.\r\n\r\nThe package makes use of React for rendering of the user interface, and uses react-redux and its concept of the state store for\r\nactions using reducers.\r\n\r\nThere are a number of sub-frameworks, each which has a set of components, actions, and reducers, and contributes to the overall State. Each such\r\nsub-framework is contained in a separate folder.\r\n\r\n## Documentation\r\n\r\nSee the [iTwin.js](https://www.itwinjs.org/learning/ui/appui-react/) documentation for more information.\r\n"
+  "readme": "# @itwin/appui-react\n\nCopyright © Bentley Systems, Incorporated. All rights reserved. See LICENSE.md for license terms and full copyright notice.\n\n## Description\n\nThe **@itwin/appui-react** package contains application fragments for View selection, and configuration of the application UI including the Backstage, Frontstages, Widgets, etc.\n\nThe AppUI React package is a portion of the iTwin.js User Interface library. It consists of major fragments of code that combine the\nfunctionality from the `@itwin/core-frontend` with the core-react, imodel-components and appui-layout-react packages to implement substantial\nfunctionality that can be used within an iTwin.js application.\n\nThe package makes use of React for rendering of the user interface, and uses react-redux and its concept of the state store for\nactions using reducers.\n\nThere are a number of sub-frameworks, each which has a set of components, actions, and reducers, and contributes to the overall State. Each such\nsub-framework is contained in a separate folder.\n\n## Documentation\n\nSee the [iTwin.js](https://www.itwinjs.org/learning/ui/appui-react/) documentation for more information.\n"
 }

package/rulesets/Categories.json

@@ -1,76 +1,72 @@
-{
-  "$schema": "../../../presentation/common/Ruleset.schema.json",
-  "id": "ui-framework/Categories",
-  "rules": [
-    {
-      "ruleType": "RootNodes",
-      "subConditions": [
-        {
-          "condition": "GetVariableStringValue(\"ViewType\") = \"3d\"",
-          "specifications": [
-            {
-              "specType": "InstanceNodesOfSpecificClasses",
-              "classes": [
-                {
-                  "schemaName": "BisCore",
-                  "classNames": [
-                    "SpatialCategory"
-                  ]
-                }
-              ],
-              "arePolymorphic": true,
-              "instanceFilter": "this.HasRelatedInstance(\"BisCore:GeometricElement3dIsInCategory\", \"Backward\", \"BisCore:Element\")",
-              "groupByClass": false,
-              "groupByLabel": false
-            }
-          ]
-        },
-        {
-          "condition": "GetVariableStringValue(\"ViewType\") = \"2d\"",
-          "specifications": [
-            {
-              "specType": "InstanceNodesOfSpecificClasses",
-              "classes": [
-                {
-                  "schemaName": "BisCore",
-                  "classNames": [
-                    "DrawingCategory"
-                  ]
-                }
-              ],
-              "arePolymorphic": true,
-              "instanceFilter": "this.HasRelatedInstance(\"BisCore:GeometricElement2dIsInCategory\", \"Backward\", \"BisCore:Element\")",
-              "groupByClass": false,
-              "groupByLabel": false
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "ruleType": "ChildNodes",
-      "condition": "ParentNode.IsOfClass(\"Category\", \"BisCore\") ANDALSO ParentNode.ECInstance.GetRelatedInstancesCount(\"BisCore:CategoryOwnsSubCategories\", \"Forward\", \"BisCore:SubCategory\") > 1",
-      "specifications": [
-        {
-          "specType": "RelatedInstanceNodes",
-          "relationshipPaths": [
-            {
-              "relationship": {
-                "schemaName": "BisCore",
-                "className": "CategoryOwnsSubCategories"
-              },
-              "direction": "Forward"
-            }
-          ],
-          "groupByClass": false,
-          "groupByLabel": false
-        }
-      ]
-    },
-    {
-      "ruleType": "LabelOverride",
-      "condition": "this.IsOfClass(\"Category\", \"BisCore\")",
-      "description": "this.Description"
-    }
-  ]
-}
+{
+  "$schema": "../../../presentation/common/Ruleset.schema.json",
+  "id": "ui-framework/Categories",
+  "rules": [
+    {
+      "ruleType": "RootNodes",
+      "subConditions": [
+        {
+          "condition": "GetVariableStringValue(\"ViewType\") = \"3d\"",
+          "specifications": [
+            {
+              "specType": "InstanceNodesOfSpecificClasses",
+              "classes": [
+                {
+                  "schemaName": "BisCore",
+                  "classNames": ["SpatialCategory"]
+                }
+              ],
+              "arePolymorphic": true,
+              "instanceFilter": "this.HasRelatedInstance(\"BisCore:GeometricElement3dIsInCategory\", \"Backward\", \"BisCore:Element\")",
+              "groupByClass": false,
+              "groupByLabel": false
+            }
+          ]
+        },
+        {
+          "condition": "GetVariableStringValue(\"ViewType\") = \"2d\"",
+          "specifications": [
+            {
+              "specType": "InstanceNodesOfSpecificClasses",
+              "classes": [
+                {
+                  "schemaName": "BisCore",
+                  "classNames": ["DrawingCategory"]
+                }
+              ],
+              "arePolymorphic": true,
+              "instanceFilter": "this.HasRelatedInstance(\"BisCore:GeometricElement2dIsInCategory\", \"Backward\", \"BisCore:Element\")",
+              "groupByClass": false,
+              "groupByLabel": false
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "ruleType": "ChildNodes",
+      "condition": "ParentNode.IsOfClass(\"Category\", \"BisCore\") ANDALSO ParentNode.ECInstance.GetRelatedInstancesCount(\"BisCore:CategoryOwnsSubCategories\", \"Forward\", \"BisCore:SubCategory\") > 1",
+      "specifications": [
+        {
+          "specType": "RelatedInstanceNodes",
+          "relationshipPaths": [
+            {
+              "relationship": {
+                "schemaName": "BisCore",
+                "className": "CategoryOwnsSubCategories"
+              },
+              "direction": "Forward"
+            }
+          ],
+          "groupByClass": false,
+          "groupByLabel": false
+        }
+      ]
+    },
+    {
+      "ruleType": "LabelOverride",
+      "condition": "this.IsOfClass(\"Category\", \"BisCore\")",
+      "description": "this.Description"
+    }
+  ]
+}

package/rulesets/Models.json

@@ -1,44 +1,42 @@
-{
-  "$schema": "../../../presentation/common/Ruleset.schema.json",
-  "id": "ui-framework/Models",
-  "rules": [
-    {
-      "ruleType": "RootNodes",
-      "specifications": [
-        {
-          "specType": "InstanceNodesOfSpecificClasses",
-          "classes": [
-            {
-              "schemaName": "BisCore",
-              "classNames": [
-                "SpatialModel"
-              ]
-            }
-          ],
-          "arePolymorphic": true,
-          "instanceFilter": "NOT this.IsPrivate",
-          "groupByClass": false,
-          "groupByLabel": false,
-          "relatedInstances": [
-            {
-              "relationshipPath": {
-                "relationship": {
-                  "schemaName": "BisCore",
-                  "className": "ModelModelsElement"
-                },
-                "direction": "Forward"
-              },
-              "isRequired": true,
-              "alias": "modeledElement"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "ruleType": "LabelOverride",
-      "condition": "modeledElement.UserLabel <> NULL ANDALSO modeledElement.CodeValue <> modeledElement.UserLabel",
-      "description": "modeledElement.CodeValue"
-    }
-  ]
-}
+{
+  "$schema": "../../../presentation/common/Ruleset.schema.json",
+  "id": "ui-framework/Models",
+  "rules": [
+    {
+      "ruleType": "RootNodes",
+      "specifications": [
+        {
+          "specType": "InstanceNodesOfSpecificClasses",
+          "classes": [
+            {
+              "schemaName": "BisCore",
+              "classNames": ["SpatialModel"]
+            }
+          ],
+          "arePolymorphic": true,
+          "instanceFilter": "NOT this.IsPrivate",
+          "groupByClass": false,
+          "groupByLabel": false,
+          "relatedInstances": [
+            {
+              "relationshipPath": {
+                "relationship": {
+                  "schemaName": "BisCore",
+                  "className": "ModelModelsElement"
+                },
+                "direction": "Forward"
+              },
+              "isRequired": true,
+              "alias": "modeledElement"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "ruleType": "LabelOverride",
+      "condition": "modeledElement.UserLabel <> NULL ANDALSO modeledElement.CodeValue <> modeledElement.UserLabel",
+      "description": "modeledElement.CodeValue"
+    }
+  ]
+}