Skip to content

Commit 2f7a384

Browse files
vkalpiasvkalpias
authored
Update to latest pcui (playcanvas#3438)
1 parent 350f7a0 commit 2f7a384

18 files changed

+793
-852
lines changed

‎examples/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ example(canvas: HTMLCanvasElement, TWEEN: any) {
9494
### `controls` function
9595
This function allows you to define a set of PCUI based interface which can be used to display stats from your example or provide users with a way of controlling the example.
9696
```tsx
97-
import { Button } from '@playcanvas/pcui/pcui-react';
97+
import Button from '@playcanvas/pcui/Button/component';
9898
controls(data: any) {
9999
return <>
100100
<Button text='Flash' onClick={() => {

‎examples/package-lock.json

Lines changed: 712 additions & 828 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"@babel/standalone": "^7.14.7",
4646
"@monaco-editor/react": "^4.2.1",
4747
"@playcanvas/eslint-config": "^1.0.7",
48-
"@playcanvas/pcui": "^1.1.22",
48+
"@playcanvas/observer": "1.1.0",
49+
"@playcanvas/pcui": "2.1.1",
4950
"@reach/router": "^1.3.4",
5051
"@types/react": "^17.0.13",
5152
"@types/react-dom": "^17.0.8",

‎examples/src/app/code-editor.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import React, { useEffect, useState } from 'react';
22
import MonacoEditor from "@monaco-editor/react";
33
// @ts-ignore: library file import
4-
import { Panel, Container, Button } from '@playcanvas/pcui/pcui-react';
4+
import Panel from '@playcanvas/pcui/Panel/component';
5+
// @ts-ignore: library file import
6+
import Container from '@playcanvas/pcui/Container/component';
7+
// @ts-ignore: library file import
8+
import Button from '@playcanvas/pcui/Button/component';
59
import { playcanvasTypeDefs } from './helpers/raw-file-loading';
610
import { File } from './helpers/types';
711

‎examples/src/app/control-panel.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import React, { useState } from 'react';
33
import { playcanvasTypeDefs } from './helpers/raw-file-loading';
44
import MonacoEditor from "@monaco-editor/react";
55
// @ts-ignore: library file import
6-
import { Panel, Container, Button } from '@playcanvas/pcui/pcui-react';
6+
import Panel from '@playcanvas/pcui/Panel/component';
7+
// @ts-ignore: library file import
8+
import Container from '@playcanvas/pcui/Container/component';
9+
// @ts-ignore: library file import
10+
import Button from '@playcanvas/pcui/Button/component';
711

812
const ControlPanel = (props: any) => {
913
const [state, setState] = useState({

‎examples/src/app/example-iframe.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import React, { useEffect, useState } from 'react';
22
import ControlPanel from './control-panel';
33
// @ts-ignore: library file import
4-
import { Container, Spinner } from '@playcanvas/pcui/pcui-react';
4+
import Container from '@playcanvas/pcui/Container/component';
5+
// @ts-ignore: library file import
6+
import Spinner from '@playcanvas/pcui/Spinner/component';
57
import * as playcanvas from 'playcanvas/build/playcanvas.js';
68
// @ts-ignore: library file import
79
import * as playcanvasDebug from 'playcanvas/build/playcanvas.dbg.js';
@@ -12,7 +14,7 @@ import * as pcx from 'playcanvas/build/playcanvas-extras.js';
1214
// @ts-ignore: library file import
1315
import * as Babel from '@babel/standalone';
1416
// @ts-ignore: library file import
15-
import { Observer } from '@playcanvas/pcui/pcui-binding';
17+
import { Observer } from '@playcanvas/observer';
1618
import * as javascriptErrorOverlay from '../../lib/javascriptErrorOverlay';
1719
import { File } from './helpers/types';
1820
import { Loader } from './helpers/loader';

‎examples/src/app/example.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import React, { Component } from 'react';
22
import * as pc from 'playcanvas/build/playcanvas.js';
33
// @ts-ignore: library file import
4-
import { Observer } from '@playcanvas/pcui/pcui-binding';
4+
import { Observer } from '@playcanvas/observer';
55
// @ts-ignore: library file import
6-
import { Container, Spinner } from '@playcanvas/pcui/pcui-react';
6+
import Container from '@playcanvas/pcui/Container/component';
7+
// @ts-ignore: library file import
8+
import Spinner from '@playcanvas/pcui/Spinner/component';
79
import { File } from './helpers/types';
810

911
interface ExampleProps {

‎examples/src/app/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useState, createRef } from 'react';
22
import ReactDOM from 'react-dom';
33
// @ts-ignore: library file import
4-
import { Container } from '@playcanvas/pcui/pcui-react';
4+
import Container from '@playcanvas/pcui/Container/component';
55
// @ts-ignore: library file import
66
import { HashRouter as Router, Switch, Route } from "react-router-dom";
77
import SideBar from './sidebar';

‎examples/src/app/menu.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import React, { useEffect, useState } from 'react';
22

33
// @ts-ignore: library file import
4-
import { Container, Button, Label, TextAreaInput } from '@playcanvas/pcui/pcui-react';
4+
import Container from '@playcanvas/pcui/Container/component';
5+
// @ts-ignore: library file import
6+
import Button from '@playcanvas/pcui/Button/component';
7+
// @ts-ignore: library file import
8+
import Label from '@playcanvas/pcui/Label/component';
9+
// @ts-ignore: library file import
10+
import TextAreaInput from '@playcanvas/pcui/TextAreaInput/component';
511

612
interface MenuProps {
713
lintErrors: boolean,

‎examples/src/app/sidebar.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
import React, { useState, useEffect } from 'react';
22
// @ts-ignore: library file import
3-
import { Container, Panel, TextInput, Label, LabelGroup, BooleanInput } from '@playcanvas/pcui/pcui-react';
3+
import Container from '@playcanvas/pcui/Container/component';
4+
// @ts-ignore: library file import
5+
import Panel from '@playcanvas/pcui/Panel/component';
6+
// @ts-ignore: library file import
7+
import TextInput from '@playcanvas/pcui/TextInput/component';
8+
// @ts-ignore: library file import
9+
import Label from '@playcanvas/pcui/Label/component';
10+
// @ts-ignore: library file import
11+
import LabelGroup from '@playcanvas/pcui/LabelGroup/component';
12+
// @ts-ignore: library file import
13+
import BooleanInput from '@playcanvas/pcui/BooleanInput/component';
14+
// @ts-ignore: library file import
15+
import BindingTwoWay from '@playcanvas/pcui/BindingTwoWay';
416
// @ts-ignore: library file import
517
import { Link } from "react-router-dom";
618
// @ts-ignore: library file import
7-
import { BindingTwoWay, Observer } from '@playcanvas/pcui/pcui-binding';
19+
import { Observer } from '@playcanvas/observer';
820

921
interface SideBarProps {
1022
categories: any

‎examples/src/examples/animation/blend-trees-1d.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import { AssetLoader } from '../../app/helpers/loader';
44
import Example from '../../app/example';
55
// @ts-ignore: library file import
6-
import { SliderInput, LabelGroup } from '@playcanvas/pcui/pcui-react';
6+
import SliderInput from '@playcanvas/pcui/SliderInput/component';
77
// @ts-ignore: library file import
8-
import { BindingTwoWay, Observer } from '@playcanvas/pcui/pcui-binding';
8+
import LabelGroup from '@playcanvas/pcui/LabelGroup/component';
9+
// @ts-ignore: library file import
10+
import BindingTwoWay from '@playcanvas/pcui/BindingTwoWay';
11+
// @ts-ignore: library file import
12+
import { Observer } from '@playcanvas/observer';
913

1014
// create an anim state graph
1115
const animStateGraphData = {

‎examples/src/examples/animation/blend-trees-2d-cartesian.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import { AssetLoader } from '../../app/helpers/loader';
44
import Example from '../../app/example';
55
// @ts-ignore: library file import
6-
import { Observer } from '@playcanvas/pcui/pcui-binding';
6+
import { Observer } from '@playcanvas/observer';
77

88
// create an anim state graph
99
const animStateGraphData = {

‎examples/src/examples/animation/blend-trees-2d-directional.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import { AssetLoader } from '../../app/helpers/loader';
44
import Example from '../../app/example';
55
// @ts-ignore: library file import
6-
import { Observer } from '@playcanvas/pcui/pcui-binding';
6+
import { Observer } from '@playcanvas/observer';
77

88
// create an anim state graph
99
const animStateGraphData = {

‎examples/src/examples/animation/component-properties.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import { AssetLoader } from '../../app/helpers/loader';
44
import Example from '../../app/example';
55
// @ts-ignore: library file import
6-
import { Button } from '@playcanvas/pcui/pcui-react';
6+
import Button from '@playcanvas/pcui/Button/component';
77

88
const animClipStaticLightData = {
99
"name": "staticLight",

‎examples/src/examples/animation/locomotion.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import { AssetLoader } from '../../app/helpers/loader';
44
import Example from '../../app/example';
55
// @ts-ignore: library file import
6-
import { Button, BooleanInput, LabelGroup } from '@playcanvas/pcui/pcui-react';
6+
import Button from '@playcanvas/pcui/Button/component';
77
// @ts-ignore: library file import
8-
import { BindingTwoWay, Observer } from '@playcanvas/pcui/pcui-binding';
8+
import LabelGroup from '@playcanvas/pcui/LabelGroup/component';
9+
// @ts-ignore: library file import
10+
import BooleanInput from '@playcanvas/pcui/BooleanInput/component';
11+
// @ts-ignore: library file import
12+
import BindingTwoWay from '@playcanvas/pcui/BindingTwoWay';
13+
// @ts-ignore: library file import
14+
import { Observer } from '@playcanvas/observer';
915
import { wasmSupported, loadWasmModuleAsync } from '../../wasm-loader';
1016

1117
// create an anim state graph

‎examples/src/examples/graphics/lights.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import Example from '../../app/example';
44
import { AssetLoader } from '../../app/helpers/loader';
55
// @ts-ignore: library file import
6-
import { Panel, SliderInput, LabelGroup, BooleanInput } from '@playcanvas/pcui/pcui-react';
6+
import Panel from '@playcanvas/pcui/Panel/component';
77
// @ts-ignore: library file import
8-
import { BindingTwoWay, Observer } from '@playcanvas/pcui/pcui-binding';
8+
import SliderInput from '@playcanvas/pcui/SliderInput/component';
9+
// @ts-ignore: library file import
10+
import LabelGroup from '@playcanvas/pcui/LabelGroup/component';
11+
// @ts-ignore: library file import
12+
import BooleanInput from '@playcanvas/pcui/BooleanInput/component';
13+
// @ts-ignore: library file import
14+
import BindingTwoWay from '@playcanvas/pcui/BindingTwoWay';
15+
// @ts-ignore: library file import
16+
import { Observer } from '@playcanvas/observer';
917

1018
class LightsExample extends Example {
1119
static CATEGORY = 'Graphics';

‎examples/src/examples/graphics/post-effects.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ import * as pc from 'playcanvas/build/playcanvas.js';
33
import { AssetLoader } from '../../app/helpers/loader';
44
import Example from '../../app/example';
55
// @ts-ignore: library file import
6-
import { Panel, SliderInput, LabelGroup, BooleanInput } from '@playcanvas/pcui/pcui-react';
6+
import Panel from '@playcanvas/pcui/Panel/component';
77
// @ts-ignore: library file import
8-
import { BindingTwoWay, Observer } from '@playcanvas/pcui/pcui-binding';
8+
import SliderInput from '@playcanvas/pcui/SliderInput/component';
9+
// @ts-ignore: library file import
10+
import LabelGroup from '@playcanvas/pcui/LabelGroup/component';
11+
// @ts-ignore: library file import
12+
import BooleanInput from '@playcanvas/pcui/BooleanInput/component';
13+
// @ts-ignore: library file import
14+
import BindingTwoWay from '@playcanvas/pcui/BindingTwoWay';
15+
// @ts-ignore: library file import
16+
import { Observer } from '@playcanvas/observer';
917

1018
class PostEffectsExample extends Example {
1119
static CATEGORY = 'Graphics';

‎examples/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const config = {
6969
alias: {
7070
lib: path.resolve(__dirname, 'lib')
7171
},
72-
extensions: ['.tsx', '.ts', '.js', '.css']
72+
extensions: ['.tsx', '.ts', '.mjs', '.js', '.css']
7373
},
7474
devtool: process.env.ENVIRONMENT === 'production' ? 'source-map' : 'eval-source-map',
7575
context: __dirname,

0 commit comments

Comments
 (0)