Skip to content

Commit d32b25f

Browse files
Removed the possibility for cameraSettings to be undefined in the getter and setter, and update updateCameraSettings command accordingly.
1 parent a08e221 commit d32b25f

3 files changed

Lines changed: 8 additions & 13 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ export class MainView extends React.Component<IProps, IStates> {
15361536
}
15371537

15381538
if (change.key === 'cameraSettings') {
1539-
const cameraSettings = change.newValue as CameraSettings | undefined;
1539+
const cameraSettings = change.newValue as CameraSettings;
15401540

15411541
if (change.type !== 'remove' && cameraSettings) {
15421542
this._cameraSettings = cameraSettings;

packages/base/src/commands.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,21 +1068,16 @@ export function addCommands(
10681068
icon: videoSolidIcon,
10691069
isToggled: () => {
10701070
const current = tracker.currentWidget?.content;
1071-
return current?.cameraSettings?.type === 'Orthographic';
1071+
return current?.cameraSettings.type === 'Orthographic';
10721072
},
10731073
execute: async () => {
10741074
const current = tracker.currentWidget;
10751075
if (!current) {
10761076
return;
10771077
} else {
1078-
const currentSettings: CameraSettings | undefined =
1079-
current.content.cameraSettings;
1080-
if (currentSettings) {
1081-
if (currentSettings.type === 'Perspective') {
1082-
current.content.cameraSettings = { type: 'Orthographic' };
1083-
} else {
1084-
current.content.cameraSettings = { type: 'Perspective' };
1085-
}
1078+
const currentSettings: CameraSettings = current.content.cameraSettings;
1079+
if (currentSettings.type === 'Perspective') {
1080+
current.content.cameraSettings = { type: 'Orthographic' };
10861081
} else {
10871082
current.content.cameraSettings = { type: 'Perspective' };
10881083
}

packages/base/src/widget.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ export class JupyterCadPanel extends SplitPanel {
176176
this._view.set('explodedView', value || null);
177177
}
178178

179-
get cameraSettings(): CameraSettings | undefined {
179+
get cameraSettings(): CameraSettings {
180180
return this._view.get('cameraSettings') as CameraSettings;
181181
}
182182

183-
set cameraSettings(value: CameraSettings | undefined) {
184-
this._view.set('cameraSettings', value || null);
183+
set cameraSettings(value: CameraSettings) {
184+
this._view.set('cameraSettings', value);
185185
}
186186

187187
get clipView(): ClipSettings | undefined {

0 commit comments

Comments
 (0)