Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions devserver/src/components/controlBar/ControlBarClearButton.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Tooltip2 } from "@blueprintjs/popover2";
import { Tooltip } from "@blueprintjs/core";
import ControlButton from "../ControlButton";
import { IconNames } from "@blueprintjs/icons";

type Props = {
onClick: () => void
}

export const ControlBarClearButton = (props: Props) => <Tooltip2 content="Clear the editor and context">
export const ControlBarClearButton = (props: Props) => <Tooltip content="Clear the editor and context">
<ControlButton
label="Clear"
icon={IconNames.Trash}
onClick={props.onClick}
/>
</Tooltip2>;
</Tooltip>;
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Tooltip2 } from "@blueprintjs/popover2";
import { Tooltip } from "@blueprintjs/core";
import ControlButton from "../ControlButton";
import { IconNames } from "@blueprintjs/icons";

type Props = {
onClick: () => void
}

export const ControlBarRefreshButton = (props: Props) => <Tooltip2 content="Manually refresh the side content">
export const ControlBarRefreshButton = (props: Props) => <Tooltip content="Manually refresh the side content">
<ControlButton
onClick={props.onClick}
icon={IconNames.Refresh}
label="Refresh"
/>
</Tooltip2>;
</Tooltip>;
7 changes: 3 additions & 4 deletions devserver/src/components/controlBar/ControlBarRunButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Position } from "@blueprintjs/core";
import { Position, Tooltip } from "@blueprintjs/core";
import { IconNames } from "@blueprintjs/icons";
import { Tooltip2 } from "@blueprintjs/popover2";
import React from "react";

import ControlButton from "../ControlButton";
Expand All @@ -20,7 +19,7 @@ type ControlButtonRunButtonProps = DispatchProps & StateProps;
export const ControlBarRunButton: React.FC<ControlButtonRunButtonProps> = (props) => {
const tooltipContent = "Evaluate the program";
return (
<Tooltip2 content={tooltipContent} placement={Position.TOP}>
<Tooltip content={tooltipContent} placement={Position.TOP}>
<ControlButton
label="Run"
icon={IconNames.PLAY}
Expand All @@ -30,6 +29,6 @@ export const ControlBarRunButton: React.FC<ControlButtonRunButtonProps> = (props
className: props.className
}}
/>
</Tooltip2>
</Tooltip>
);
};
7 changes: 3 additions & 4 deletions devserver/src/components/sideContent/SideContent.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Card, Icon, Tab, type TabProps, Tabs } from "@blueprintjs/core";
import { Tooltip2 } from "@blueprintjs/popover2";
import { Card, Icon, Tab, type TabProps, Tabs, Tooltip } from "@blueprintjs/core";
import React from "react";
import type { SideContentTab } from "./types";

Expand Down Expand Up @@ -37,11 +36,11 @@ const renderTab = (
) => {
const iconSize = 20;
const tabTitle = (
<Tooltip2 content={tab.label}>
<Tooltip content={tab.label}>
<div className={!shouldAlert ? "side-content-tooltip" : "side-content-tooltip side-content-tab-alert"}>
<Icon icon={tab.iconName} iconSize={iconSize} />
</div>
</Tooltip2>
</Tooltip>
);
const tabProps: TabProps = {
id: tab.id,
Expand Down
1 change: 0 additions & 1 deletion devserver/src/styles/index.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use 'sass:math';

@import '@blueprintjs/core/lib/css/blueprint.css';
@import '@blueprintjs/popover2/lib/css/blueprint-popover2.css';
@import '@blueprintjs/core/lib/scss/variables';

// CSS styles for react-mde Markdown editor
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@
"yarnhook": "^0.5.1"
},
"dependencies": {
"@blueprintjs/core": "^4.20.2",
"@blueprintjs/icons": "^4.4.0",
"@blueprintjs/popover2": "^1.4.3",
"@blueprintjs/core": "^5.9.1",
"@blueprintjs/icons": "^5.7.1",
"@box2d/core": "^0.10.0",
"@box2d/debug-draw": "^0.10.0",
"@jscad/modeling": "2.9.6",
Expand Down
3 changes: 2 additions & 1 deletion scripts/src/build/modules/tab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ export const getTabOptions = (tabs: string[], { srcDir, outDir }: Record<'srcDir
'react-ace',
'react-dom',
'react/jsx-runtime',
'@blueprintjs/*',
'@blueprintjs/core',
'@blueprintjs/icons',
// 'phaser',
],
jsx: 'automatic',
Expand Down
7 changes: 3 additions & 4 deletions src/tabs/Csg/hover_control_hint.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* [Imports] */
import { Icon } from '@blueprintjs/core';
import { Tooltip2 } from '@blueprintjs/popover2';
import { Icon, Tooltip } from '@blueprintjs/core';
import React from 'react';
import { BP_ICON_COLOR, SA_TAB_BUTTON_WIDTH, SA_TAB_ICON_SIZE } from '../common/css_constants';
import type { HintProps } from './types';
Expand All @@ -18,7 +17,7 @@ export default class HoverControlHint extends React.Component<HintProps> {
height: SA_TAB_BUTTON_WIDTH,
}}
>
<Tooltip2
<Tooltip
content={this.props.tooltipText}
placement="left"
>
Expand All @@ -27,7 +26,7 @@ export default class HoverControlHint extends React.Component<HintProps> {
size={SA_TAB_ICON_SIZE}
color={BP_ICON_COLOR}
/>
</Tooltip2>
</Tooltip>
</div>;
}
}
11 changes: 5 additions & 6 deletions src/tabs/Curve/animation_canvas_3d_curve.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Icon, Slider } from '@blueprintjs/core';
import { Icon, Slider, Tooltip } from '@blueprintjs/core';
import { IconNames } from '@blueprintjs/icons';
import { Tooltip2 } from '@blueprintjs/popover2';
import React from 'react';
import { type AnimatedCurve } from '../../bundles/curve/types';
import AutoLoopSwitch from '../common/AutoLoopSwitch';
Expand Down Expand Up @@ -292,7 +291,7 @@ State
disabled={Boolean(this.state.errored)}
onClick={ this.onPlayButtonClick }
/>
<Tooltip2
<Tooltip
content="Reset"
placement="top"
>
Expand All @@ -302,7 +301,7 @@ State
>
<Icon icon={ IconNames.RESET } />
</ButtonComponent>
</Tooltip2>
</Tooltip>
<div
style={{
display: 'flex',
Expand All @@ -324,7 +323,7 @@ State
onChange={ this.onTimeSliderChange }
onRelease={ this.onTimeSliderRelease }
/>
<Tooltip2
<Tooltip
content="Display Angle"
placement="top"
>
Expand All @@ -339,7 +338,7 @@ State

onChange={ this.onAngleSliderChange }
/>
</Tooltip2>
</Tooltip>
</div>
<AutoLoopSwitch
isAutoLooping={ this.state.isAutoLooping }
Expand Down
7 changes: 3 additions & 4 deletions src/tabs/common/AnimationCanvas.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Icon, Slider } from '@blueprintjs/core';
import { Icon, Slider, Tooltip } from '@blueprintjs/core';
import { IconNames } from '@blueprintjs/icons';
import { Tooltip2 } from '@blueprintjs/popover2';
import React from 'react';
import { type glAnimation } from '../../typings/anim_types';
import AutoLoopSwitch from './AutoLoopSwitch';
Expand Down Expand Up @@ -269,7 +268,7 @@ AnimCanvasState
disabled={Boolean(this.state.errored)}
onClick={this.onPlayButtonClick}
/>
<Tooltip2
<Tooltip
content="Reset"
placement="top"
>
Expand All @@ -279,7 +278,7 @@ AnimCanvasState
>
<Icon icon={ IconNames.RESET } />
</ButtonComponent>
</Tooltip2>
</Tooltip>
<Slider
value={ this.state.animTimestamp }
min={ 0 }
Expand Down
7 changes: 3 additions & 4 deletions src/tabs/common/PlayButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* [Imports] */
import { Icon, type ButtonProps } from '@blueprintjs/core';
import { Tooltip2 } from '@blueprintjs/popover2';
import { Icon, type ButtonProps, Tooltip } from '@blueprintjs/core';
import React from 'react';
import { IconNames } from '@blueprintjs/icons';
import ButtonComponent from './ButtonComponent';
Expand All @@ -14,7 +13,7 @@ export type PlayButtonProps = {
/* [Main] */
export default class PlayButton extends React.Component<PlayButtonProps> {
render() {
return <Tooltip2
return <Tooltip
content={ this.props.isPlaying ? 'Pause' : 'Play' }
placement="top"
>
Expand All @@ -23,6 +22,6 @@ export default class PlayButton extends React.Component<PlayButtonProps> {
icon={ this.props.isPlaying ? IconNames.PAUSE : IconNames.PLAY }
/>
</ButtonComponent>
</Tooltip2>;
</Tooltip>;
}
}
7 changes: 3 additions & 4 deletions src/tabs/physics_2d/DebugDrawCanvas.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
// We have to disable linting rules since Box2D functions do not
// follow the same guidelines as the rest of the codebase.

import { Button, Icon, Slider } from '@blueprintjs/core';
import { Button, Icon, Slider, Tooltip } from '@blueprintjs/core';
import { IconNames } from '@blueprintjs/icons';
import { Tooltip2 } from '@blueprintjs/popover2';
import React from 'react';
import { DebugDraw } from '@box2d/debug-draw';
import { DrawShapes, type b2World } from '@box2d/core';
Expand Down Expand Up @@ -209,13 +208,13 @@ DebugDrawCanvasState
marginRight: '20px',
}}
>
<Tooltip2 content={this.state.isPlaying ? 'Pause' : 'Play'}>
<Tooltip content={this.state.isPlaying ? 'Pause' : 'Play'}>
<Button onClick={this.onPlayButtonClick}>
<Icon
icon={this.state.isPlaying ? IconNames.PAUSE : IconNames.PLAY}
/>
</Button>
</Tooltip2>
</Tooltip>
</div>
<div
style={{
Expand Down
Loading