Merge branch 'main' into reactive-toolbar

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

@@ -203,7 +203,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);
 
@@ -1266,7 +1266,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/commands.ts

@@ -946,6 +946,10 @@ export function addCommands(
     icon: wireframeIcon
   });
 
+  tracker.currentChanged.connect(() => {
+    commands.notifyCommandChanged(CommandIDs.wireframe);
+  });
+
   commands.addCommand(CommandIDs.chamfer, {
     label: trans.__('Make chamfer'),
     isEnabled: () => {
@@ -1071,6 +1075,10 @@ export function addCommands(
     }
   });
 
+  tracker.currentChanged.connect(() => {
+    commands.notifyCommandChanged(CommandIDs.updateClipView);
+  });
+
   commands.addCommand(CommandIDs.exportJcad, {
     label: trans.__('Export to .jcad'),
     isEnabled: () => {

python/jupytercad_app/src/app/plugins/launcher/index.ts

@@ -22,7 +22,7 @@ const launcherPlugin: JupyterFrontEndPlugin<void> = {
         if (!label) {
           continue;
         }
-        if (label.innerHTML.includes('New JCAD File')) {
+        if (label.innerHTML.includes('CAD File')) {
           const els = element
             .getElementsByClassName('jp-Launcher-sectionTitle')
             ?.item(0);

python/jupytercad_core/src/jcadplugin/plugins.ts

@@ -85,7 +85,8 @@ const activate = (
     mimeTypes: ['text/json'],
     extensions: ['.jcad', '.JCAD'],
     fileFormat: 'text',
-    contentType: 'jcad'
+    contentType: 'jcad',
+    icon: logoIcon
   });
 
   const jcadSharedModelFactory: SharedDocumentFactory = () => {
@@ -111,7 +112,7 @@ const activate = (
   });
 
   app.commands.addCommand(CommandIDs.createNew, {
-    label: args => 'New JCAD File',
+    label: args => 'CAD File',
     caption: 'Create a new JCAD Editor',
     icon: logoIcon,
     execute: async args => {

python/jupytercad_core/src/stepplugin/plugins.ts

@@ -19,6 +19,7 @@ import { IThemeManager, WidgetTracker } from '@jupyterlab/apputils';
 import { JupyterCadStepModelFactory } from './modelfactory';
 import { JupyterCadWidgetFactory } from '../factory';
 import { JupyterCadStepDoc } from './model';
+import { logoIcon } from '@jupytercad/base';
 
 const FACTORY = 'JupyterCAD STEP Viewer';
 
@@ -53,7 +54,8 @@ const activate = (
     mimeTypes: ['text/json'],
     extensions: ['.step', '.STEP'],
     fileFormat: 'text',
-    contentType: 'step'
+    contentType: 'step',
+    icon: logoIcon
   });
 
   const stepSharedModelFactory: SharedDocumentFactory = () => {

python/jupytercad_core/src/stlplugin/plugins.ts

@@ -19,6 +19,7 @@ import { IThemeManager, WidgetTracker } from '@jupyterlab/apputils';
 import { JupyterCadStlModelFactory } from './modelfactory';
 import { JupyterCadWidgetFactory } from '../factory';
 import { JupyterCadStlDoc } from './model';
+import { logoIcon } from '@jupytercad/base';
 
 const FACTORY = 'JupyterCAD STL Viewer';
 
@@ -53,7 +54,8 @@ const activate = (
     mimeTypes: ['text/json'],
     extensions: ['.stl', '.STL'],
     fileFormat: 'text',
-    contentType: 'stl'
+    contentType: 'stl',
+    icon: logoIcon
   });
 
   const stlSharedModelFactory: SharedDocumentFactory = () => {

ui-tests/tests/ui.spec.ts

@@ -300,12 +300,9 @@ test.describe('UI Test', () => {
 
   test.describe('JCAD creation test', () => {
     test.describe('Extension activation test', () => {
-      test('should create a new JCAD file', async ({ page, request }) => {
+      test('should create a CAD File', async ({ page, request }) => {
         await page.goto();
-        await page
-          .getByLabel('notebook content')
-          .getByText('New JCAD File')
-          .click();
+        await page.getByLabel('notebook content').getByText('CAD File').click();
 
         await page.getByTitle('New Box').getByRole('button').click();
         await page.getByRole('button', { name: 'Submit' }).click();