Skip to content

Commit 1c61f7f

Browse files
committed
correct typings, exported them and used them
1 parent 751c33d commit 1c61f7f

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-css-transform",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "A React component to help handle complex nested 2d and 3d css transformations ",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

src/Transform2d.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { mat2d, vec2 } from 'gl-matrix';
44

5-
import { MULTIPLICATION_ORDER } from './constants';
5+
import { MULTIPLICATION_ORDER, vec2Shape, glMatrixType } from './constants';
66

77
export default class Transform2d extends React.Component {
88
static propTypes = {
9-
parentMatrixWorld: PropTypes.oneOfType([PropTypes.instanceOf(Float32Array), PropTypes.arrayOf(PropTypes.number)]),
9+
parentMatrixWorld: glMatrixType,
1010
multiplicationOrder: PropTypes.oneOf([MULTIPLICATION_ORDER.PRE, MULTIPLICATION_ORDER.POST]),
11-
translate: PropTypes.object,
12-
scale: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
13-
rotate: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
11+
translate: vec2Shape,
12+
scale: PropTypes.oneOfType([vec2Shape, glMatrixType, PropTypes.number]),
13+
rotate: PropTypes.number,
1414
children: PropTypes.node.isRequired,
1515
};
1616

src/Transform3d.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import { mat4, vec3 } from 'gl-matrix';
44

5-
import { MULTIPLICATION_ORDER } from './constants';
5+
import { MULTIPLICATION_ORDER, vec3Shape, glMatrixType } from './constants';
66

77
export default class Transform3d extends React.Component {
88
static propTypes = {
9-
parentMatrixWorld: PropTypes.oneOfType([PropTypes.instanceOf(Float32Array), PropTypes.arrayOf(PropTypes.number)]),
9+
parentMatrixWorld: glMatrixType,
1010
multiplicationOrder: PropTypes.oneOf([MULTIPLICATION_ORDER.PRE, MULTIPLICATION_ORDER.POST]),
11-
translate: PropTypes.object,
12-
scale: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
11+
translate: vec3Shape,
12+
scale: PropTypes.oneOfType([vec3Shape, PropTypes.number]),
1313
rotate: PropTypes.number,
14-
rotateAxis: PropTypes.object,
14+
rotateAxis: vec3Shape,
1515
children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
1616
};
1717

src/constants.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ export const MULTIPLICATION_ORDER = {
4242
};
4343

4444
export const vec2Shape = PropTypes.shape({
45-
x: PropTypes.number.isRequired,
46-
y: PropTypes.number.isRequired,
45+
x: PropTypes.number,
46+
y: PropTypes.number,
4747
});
4848

4949
export const vec3Shape = PropTypes.shape({
50-
x: PropTypes.number.isRequired,
51-
y: PropTypes.number.isRequired,
52-
z: PropTypes.number.isRequired,
50+
x: PropTypes.number,
51+
y: PropTypes.number,
52+
z: PropTypes.number,
5353
});
5454

5555
export const glMatrixType = PropTypes.instanceOf(glMatrix.ARRAY_TYPE);

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { MULTIPLICATION_ORDER } from './constants';
1+
export { MULTIPLICATION_ORDER, glMatrixType, vec2Shape, vec3Shape } from './constants';
22
export { default as Transform2d } from './Transform2d';
33
export { default as Transform3d } from './Transform3d';

0 commit comments

Comments
 (0)