Skip to content

Commit b5f0b6e

Browse files
authored
Merge pull request #13 from krsbx/remove-strict-mode
chore: remove react strict mode
2 parents 5d725c9 + 4fb2563 commit b5f0b6e

11 files changed

Lines changed: 20 additions & 32 deletions

File tree

.eslintrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"sourceType": "module"
1616
},
1717
"plugins": [
18+
"react",
1819
"@typescript-eslint"
1920
],
2021
"rules": {

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mind-ar-react",
3-
"version": "0.1.0-beta3a",
3+
"version": "0.1.0-beta3c",
44
"main": "dist/index.js",
55
"scripts": {
66
"dev": "vite",
@@ -15,9 +15,9 @@
1515
"react-dom": "^18.0.0"
1616
},
1717
"dependencies": {
18-
"aframe-react-component": "^0.1.0-beta2a",
18+
"aframe-react-component": "^0.1.0-beta2b",
1919
"lodash": "^4.17.21",
20-
"mind-ar-ts": "^0.5.2-beta2b"
20+
"mind-ar-ts": "^0.5.2-beta2c"
2121
},
2222
"devDependencies": {
2323
"@commitlint/cli": "^17.0.3",
@@ -33,6 +33,7 @@
3333
"eslint-config-prettier": "^8.5.0",
3434
"eslint-plugin-import": "^2.26.0",
3535
"eslint-plugin-prettier": "^4.0.0",
36+
"eslint-plugin-react": "^7.30.1",
3637
"husky": "^8.0.1",
3738
"prettier": "^2.7.1",
3839
"react-dropzone": "^14.2.1",

src/Examples/FaceTracking.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { Camera, Sphere } from 'aframe-react-component';
3-
import FaceTracking from '../components/AR/FaceTracking';
3+
import FaceTracking from '../provider/FaceTracking';
44
import { Faces, Scene } from '../components';
55

66
const ExampleFaceTracking = () => {

src/Examples/ImageTracking.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from 'react';
22
import { Camera, GLTFModel, Plane, Assets, Item } from 'aframe-react-component';
3-
import ImageTracking from '../components/AR/ImageTracking';
3+
import ImageTracking from '../provider/ImageTracking';
44
import { Entity, Marker, Scene } from '../components';
55

66
const ExampleImageTracking = () => {

src/components/Scene.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import _ from 'lodash';
12
import React, { useEffect, useRef } from 'react';
23
import { Scene as AScene, SystemDefinition } from 'aframe';
34
import { Scene as SceneComponent } from 'aframe-react-component';
@@ -20,20 +21,16 @@ const Scene = React.forwardRef<AScene, _Scene>(({ children, ...props }, ref) =>
2021
} = props;
2122

2223
useEffect(() => {
23-
if (!sceneRef.current) return;
24-
25-
if (!mindARImage || !mindARFace) return;
26-
27-
const arSystem = sceneRef.current.systems[
24+
const arSystem = sceneRef.current?.systems[
2825
mindARImage ? AR_COMPONENT_NAME.IMAGE.IMAGE_SYSTEM : AR_COMPONENT_NAME.FACE.FACE_SYSTEM
29-
] as SystemDefinition<IMindARImageSystem | IMindARFaceSystem>;
26+
] as SystemDefinition<IMindARImageSystem | IMindARFaceSystem> | undefined;
3027

3128
return () => {
3229
if (!arSystem) return;
3330

3431
arSystem.stop();
3532
};
36-
}, [sceneRef.current]);
33+
}, []);
3734

3835
return (
3936
<SceneComponent

src/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
import { Entity, Faces, Marker, Scene } from './components';
2-
import FaceTracking from './components/AR/FaceTracking';
3-
import ImageTracking from './components/AR/ImageTracking';
42

5-
const Components = {
3+
const MindAR = {
64
Entity,
75
Faces,
86
Marker,
97
Scene,
108
};
119

12-
const MindAR = {
13-
FaceTracking,
14-
ImageTracking,
15-
Components,
16-
};
17-
18-
export { FaceTracking, ImageTracking, Components as MindAR };
10+
export { MindAR };
1911
export { default as useCompiler } from './utils/useCompiler';
2012
export type { CompilerState } from './utils/interfaces';
2113
export * from './utils/constant';

src/main.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@ import ReactDOM from 'react-dom/client';
33
import App from './App';
44
import './index.css';
55

6-
ReactDOM.createRoot(document.getElementById('root')!).render(
7-
<React.StrictMode>
8-
<App />
9-
</React.StrictMode>
10-
);
6+
ReactDOM.createRoot(document.getElementById('root')!).render(<App />);
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import 'aframe';
1+
import React from 'react';
22
import 'mind-ar-ts/dist/mindar-face.prod.js';
33
import 'mind-ar-ts/dist/mindar-face-aframe.prod.js';
4-
import React from 'react';
54

65
const FaceTracking = ({ children }: { children: React.ReactNode }) => (
76
<React.Fragment>{children}</React.Fragment>
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import 'aframe';
1+
import React from 'react';
22
import 'mind-ar-ts/dist/mindar-image.prod.js';
33
import 'mind-ar-ts/dist/mindar-image-aframe.prod.js';
44
import 'mind-ar-ts/dist/mindar-gesture.prod.js';
5-
import React from 'react';
65

76
const ImageTracking = ({ children }: { children: React.ReactNode }) => (
87
<React.Fragment>{children}</React.Fragment>

src/provider/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { default as FaceTracking } from './FaceTracking';
2+
export { default as ImageTracking } from './ImageTracking';

0 commit comments

Comments
 (0)