Merge branch 'main' into center-view

CHANGELOG.md

@@ -40,6 +40,41 @@ pip install jupytercad-freecad
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 3.0.0a3
+
+([Full Changelog](https://github.com/jupytercad/JupyterCAD/compare/@jupytercad/[email protected]))
+
+### Enhancements made
+
+- Add icons in filebrowser [#460](https://github.com/jupytercad/JupyterCAD/pull/460) ([@martinRenou](https://github.com/martinRenou))
+- Reactive toolbar w.r.t. width [#455](https://github.com/jupytercad/JupyterCAD/pull/455) ([@arjxn-py](https://github.com/arjxn-py))
+- Improve the UX of the clip-plane and wireframe buttons [#441](https://github.com/jupytercad/JupyterCAD/pull/441) ([@arjxn-py](https://github.com/arjxn-py))
+- Add interactive axes helper [#440](https://github.com/jupytercad/JupyterCAD/pull/440) ([@arjxn-py](https://github.com/arjxn-py))
+- Include Notebook API into lite kernel deployment [#364](https://github.com/jupytercad/JupyterCAD/pull/364) ([@martinRenou](https://github.com/martinRenou))
+
+### Bugs fixed
+
+- Toggle buttons working correctly when multiple editors are open [#447](https://github.com/jupytercad/JupyterCAD/pull/447) ([@arjxn-py](https://github.com/arjxn-py))
+- Update example for colors [#437](https://github.com/jupytercad/JupyterCAD/pull/437) ([@arjxn-py](https://github.com/arjxn-py))
+- Fix lite build [#436](https://github.com/jupytercad/JupyterCAD/pull/436) ([@martinRenou](https://github.com/martinRenou))
+
+### Maintenance and upkeep improvements
+
+- Reduce field of view of Camera [#465](https://github.com/jupytercad/JupyterCAD/pull/465) ([@arjxn-py](https://github.com/arjxn-py))
+- Rename launcher button [#461](https://github.com/jupytercad/JupyterCAD/pull/461) ([@martinRenou](https://github.com/martinRenou))
+- Try fixing galata workflow [#439](https://github.com/jupytercad/JupyterCAD/pull/439) ([@arjxn-py](https://github.com/arjxn-py))
+- Lite deployment missing deps [#434](https://github.com/jupytercad/JupyterCAD/pull/434) ([@martinRenou](https://github.com/martinRenou))
+- Lite deployment: Disable docprovider-extension [#433](https://github.com/jupytercad/JupyterCAD/pull/433) ([@martinRenou](https://github.com/martinRenou))
+- Update `ThreeJS` [#418](https://github.com/jupytercad/JupyterCAD/pull/418) ([@arjxn-py](https://github.com/arjxn-py))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupytercad/JupyterCAD/graphs/contributors?from=2024-09-19&to=2024-10-09&type=c))
+
+[@arjxn-py](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Aarjxn-py+updated%3A2024-09-19..2024-10-09&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Agithub-actions+updated%3A2024-09-19..2024-10-09&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3AmartinRenou+updated%3A2024-09-19..2024-10-09&type=Issues) | [@pre-commit-ci](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Apre-commit-ci+updated%3A2024-09-19..2024-10-09&type=Issues) | [@trungleduc](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Atrungleduc+updated%3A2024-09-19..2024-10-09&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 3.0.0a2
 
 ([Full Changelog](https://github.com/jupytercad/JupyterCAD/compare/v3.0.0a1...e5acfcf87321b8f14a5c18b208e77ad45388dd3c))
@@ -74,8 +109,6 @@ pip install jupytercad-freecad
 
 [@arjxn-py](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Aarjxn-py+updated%3A2024-09-16..2024-09-19&type=Issues) | [@davidbrochart](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Adavidbrochart+updated%3A2024-09-16..2024-09-19&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Agithub-actions+updated%3A2024-09-16..2024-09-19&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3AmartinRenou+updated%3A2024-09-16..2024-09-19&type=Issues) | [@trungleduc](https://github.com/search?q=repo%3Ajupytercad%2FJupyterCAD+involves%3Atrungleduc+updated%3A2024-09-16..2024-09-19&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 3.0.0a1
 
 ([Full Changelog](https://github.com/jupytercad/JupyterCAD/compare/@jupytercad/[email protected]))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-root",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "private": true,
   "homepage": "https://github.com/jupytercad/JupyterCAD",
   "repository": {

packages/base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/base",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "A JupyterLab extension for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -38,8 +38,8 @@
     "@deathbeds/jupyterlab-rjsf": "^1.1.0",
     "@jupyter/docprovider": "^2.0.0",
     "@jupyter/ydoc": "^1.0.0",
-    "@jupytercad/occ-worker": "^3.0.0-alpha.2",
-    "@jupytercad/schema": "^3.0.0-alpha.2",
+    "@jupytercad/occ-worker": "^3.0.0-alpha.3",
+    "@jupytercad/schema": "^3.0.0-alpha.3",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/completer": "^4.2.4",

packages/base/src/3dview/mainview.tsx

@@ -210,7 +210,7 @@ export class MainView extends React.Component<IProps, IStates> {
       DEFAULT_EDGE_COLOR.set(getCSSVariableColor(DEFAULT_EDGE_COLOR_CSS));
       SELECTED_MESH_COLOR.set(getCSSVariableColor(SELECTED_MESH_COLOR_CSS));
 
-      this._camera = new THREE.PerspectiveCamera(90, 2, 0.1, 1000);
+      this._camera = new THREE.PerspectiveCamera(50, 2, 0.1, 1000);
       this._camera.position.set(8, 8, 8);
       this._camera.up.set(0, 0, 1);
 
@@ -1298,7 +1298,7 @@ export class MainView extends React.Component<IProps, IStates> {
     this._scene.remove(this._camera);
 
     if (this._cameraSettings.type === 'Perspective') {
-      this._camera = new THREE.PerspectiveCamera(90, 2, 0.1, 1000);
+      this._camera = new THREE.PerspectiveCamera(50, 2, 0.1, 1000);
     } else {
       const width = this.divRef.current?.clientWidth || 0;
       const height = this.divRef.current?.clientHeight || 0;

packages/base/src/toolbar/widget.tsx

@@ -4,6 +4,7 @@ import {
   ReactWidget,
   redoIcon,
   Toolbar,
+  ReactiveToolbar,
   undoIcon,
   terminalIcon
 } from '@jupyterlab/ui-components';
@@ -26,9 +27,9 @@ export class Separator extends Widget {
   }
 }
 
-export class ToolbarWidget extends Toolbar {
+export class ToolbarWidget extends ReactiveToolbar {
   constructor(options: ToolbarWidget.IOptions) {
-    super(options);
+    super();
     this.addClass('jpcad-toolbar-widget');
     setTimeout(() => {
       // Allow the widget tracker to propagate the new widget signal.
@@ -231,7 +232,7 @@ export class ToolbarWidget extends Toolbar {
             })
           );
         });
-        this.addItem('spacer', Toolbar.createSpacerItem());
+        this.addItem('spacer', ReactiveToolbar.createSpacerItem());
 
         // Users
         this.addItem(

packages/occ-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/occ-worker",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "Jupytercad opencascade worker package.",
   "keywords": [
     "jupytercad"
@@ -36,8 +36,8 @@
     "watch": "tsc-watch --onSuccess \"webpack --config worker.webpack.config.js --mode=development\""
   },
   "dependencies": {
-    "@jupytercad/opencascade": "^3.0.0-alpha.2",
-    "@jupytercad/schema": "^3.0.0-alpha.2",
+    "@jupytercad/opencascade": "^3.0.0-alpha.3",
+    "@jupytercad/schema": "^3.0.0-alpha.3",
     "@lumino/coreutils": "^2.0.0",
     "uuid": "^8.3.2"
   },

packages/opencascade/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/opencascade",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "The custom OpenCascade build for JupyterCAD.",
   "keywords": [
     "jupyter",

packages/schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/schema",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "A Jupytercad schema package.",
   "keywords": [
     "jupytercad"

python/jupytercad/jupytercad/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "3.0.0a2"
+__version__ = "3.0.0a3"
 
 from jupytercad_lab import CadDocument  # noqa

python/jupytercad/pyproject.toml

@@ -19,9 +19,9 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "jupytercad_core==3.0.0a2",
-  "jupytercad_lab==3.0.0a2",
-  "jupytercad_app==3.0.0a2",
+  "jupytercad_core==3.0.0a3",
+  "jupytercad_lab==3.0.0a3",
+  "jupytercad_app==3.0.0a3",
 ]
 dynamic = ["version"]
 license = {file = "LICENSE"}

python/jupytercad_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-app",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "A JupyterLab standalone app for 3D modelling.",
   "keywords": [
     "jupyter",
@@ -54,8 +54,8 @@
     "@jupyter/collaboration": "^3.0.0-beta.6",
     "@jupyter/docprovider": "^2.0.0",
     "@jupyter/ydoc": "^0.3.4 || ^1.0.2",
-    "@jupytercad/base": "^3.0.0-alpha.2",
-    "@jupytercad/schema": "^3.0.0-alpha.2",
+    "@jupytercad/base": "^3.0.0-alpha.3",
+    "@jupytercad/schema": "^3.0.0-alpha.3",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/application-extension": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",

python/jupytercad_core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-core",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "JupyterCad core extension",
   "keywords": [
     "jupyter",
@@ -54,9 +54,9 @@
   },
   "dependencies": {
     "@jupyter/docprovider": "^2.0.0",
-    "@jupytercad/base": "^3.0.0-alpha.2",
-    "@jupytercad/occ-worker": "^3.0.0-alpha.2",
-    "@jupytercad/schema": "^3.0.0-alpha.2",
+    "@jupytercad/base": "^3.0.0-alpha.3",
+    "@jupytercad/occ-worker": "^3.0.0-alpha.3",
+    "@jupytercad/schema": "^3.0.0-alpha.3",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/docregistry": "^4.0.0",

python/jupytercad_lab/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupytercad/jupytercad-lab",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.3",
   "description": "JupyterCad Lab extension.",
   "keywords": [
     "jupyter",
@@ -52,9 +52,9 @@
   },
   "dependencies": {
     "@jupyter/docprovider": "^2.0.0",
-    "@jupytercad/base": "^3.0.0-alpha.2",
-    "@jupytercad/jupytercad-core": "^3.0.0-alpha.2",
-    "@jupytercad/schema": "^3.0.0-alpha.2",
+    "@jupytercad/base": "^3.0.0-alpha.3",
+    "@jupytercad/jupytercad-core": "^3.0.0-alpha.3",
+    "@jupytercad/schema": "^3.0.0-alpha.3",
     "@jupyterlab/application": "^4.0.0",
     "@jupyterlab/apputils": "^4.0.0",
     "@jupyterlab/coreutils": "^6.0.0",

ui-tests/tests/ui.spec.ts

@@ -359,6 +359,7 @@ test.describe('UI Test', () => {
     test('should open console', async ({ page }) => {
       await page.goto();
       await page.getByLabel('notebook content').getByText('CAD File').click();
+      await page.getByRole('button', { name: 'More commands' }).click();
       await page.getByRole('button', { name: 'Toggle console' }).click();
       await page.getByRole('button', { name: 'Remove console' });
       await page.getByRole('textbox').nth(1).click();