Skip to content

Commit 8630d3b

Browse files
aeagleaeagle
committed
Merge branch 'master' into v0.2.0
# Conflicts: # package-lock.json # package.json
2 parents 4f9aba6 + abff535 commit 8630d3b

File tree

5 files changed

+188
-125
lines changed

5 files changed

+188
-125
lines changed

‎.storybook/package.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "react-spaces-storybook",
3+
"version": "0.1.26",
4+
"files": [
5+
"**/*.*"
6+
],
7+
"repository": "github:aeagle/react-spaces",
8+
"author": {
9+
"name": "Allan Eagle",
10+
"url": "https://www.allaneagle.com"
11+
},
12+
"bugs": "https://github.com/aeagle/react-spaces/issues",
13+
"homepage": "https://www.allaneagle.com/projects/react-spaces",
14+
"keywords": [
15+
"react",
16+
"reactjs",
17+
"reactjs components",
18+
"component library",
19+
"components",
20+
"web",
21+
"web ui",
22+
"javascript library"
23+
],
24+
"license": "MIT",
25+
"description": "Storybook documentation for react-spaces"
26+
}

‎README.md‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# React Spaces
22

3-
![NPM](https://img.shields.io/npm/v/react-spaces.svg) ![Azure Pipelines](https://allan-eagle.visualstudio.com/All%20projects/_apis/build/status/React-Spaces%20publish)
3+
![NPM](https://img.shields.io/npm/v/react-spaces.svg) ![Azure Pipelines](https://allan-eagle.visualstudio.com/All%20projects/_apis/build/status/aeagle.react-spaces?branchName=master)
44

55
React Spaces allow you to divide a page or container HTML element into spaces. These spaces know how to behave in relation to each other and can also be divided into further nested spaces.
66

@@ -16,27 +16,27 @@ Used at the top level of all other spaces.
1616

1717
This space will take over the full viewport of the browser window. Resizing the browser window will automatically adjust the size of this space and all the nested spaces.
1818

19-
**\<Fixed /\>**
19+
**\<Fixed /\>**
2020

2121
This space can be given a height and optionally a width (by default it will size to 100% of it's container). All nested spaces will be contained within this fixed size space.
2222

2323
### Anchored spaces
2424

2525
These can be used within the top-level spaces **\<ViewPort /\>** and **\<Fixed /\>** or nested within other spaces.
2626

27-
**\<Left /\>** and **\<Right /\>**
27+
**\<Left /\>** and **\<Right /\>**
2828

2929
A space anchored to the left or right of the parent container/space. A size can be specified in pixels or as a percentage to determine its width.
3030

31-
**\<Top /\>** and **\<Bottom /\>**
31+
**\<Top /\>** and **\<Bottom /\>**
3232

3333
A space anchored to the top or bottom of the parent container/space. A size can be specified in pixels or as a percentage to determine its height.
3434

3535
There are resizable versions of these components called **\<LeftResizable /\>**, **\<RightResizable /\>**, **\<TopResizable /\>** and **\<BottomResizable /\>** which allow the spaces to be resized from the outer edge by dragging with the mouse.
3636

3737
### Other
3838

39-
**\<Fill /\>**
39+
**\<Fill /\>**
4040

4141
A space which consumes any available area left in the parent container/space taking into account any anchored spaces on every side.
4242

@@ -46,19 +46,15 @@ Layers allow you to create layers within a parent space, for example:
4646

4747
```html
4848
<ViewPort>
49-
50-
<Layer zIndex={0}>
51-
<LeftResizable size="20%" /> // floating sidebar
52-
</Layer>
53-
54-
<Layer zIndex={1}>
55-
<Fill />
56-
</Layer>
49+
<Layer zIndex="{0}"> <LeftResizable size="20%" /> // floating sidebar </Layer>
5750

51+
<Layer zIndex="{1}">
52+
<Fill />
53+
</Layer>
5854
</ViewPort>
5955
```
6056

61-
**\<Centered /\>**
57+
**\<Centered /\>**
6258

6359
Centres the content of a space horizontally and vertically.
6460

@@ -75,15 +71,16 @@ npm install react-spaces --save
7571
```
7672

7773
```typescript
78-
import * as Spaces from 'react-spaces';
74+
import * as Spaces from "react-spaces";
7975
```
8076

8177
View full documentation [here](https://www.allaneagle.com/react-spaces/demo/).
8278

8379
## Donation
80+
8481
If you find this library useful, consider making a small donation to fund a cup of coffee:
8582

8683
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AAYPWGUQBUDAA"
8784
title="If you find this library useful, consider making a small donation to fund a cup of coffee" alt="Make Donation" style="text-decoration: none;">
88-
<img src="https://www.allaneagle.com/donation.png" />
85+
<img src="https://www.allaneagle.com/donation.png" />
8986
</a>

‎azure-pipelines.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Node.js with React
2+
# Build a Node.js project that uses React.
3+
# Add steps that analyze code, save build artifacts, deploy, and more:
4+
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
5+
6+
pool:
7+
vmImage: 'ubuntu-latest'
8+
9+
steps:
10+
- task: NodeTool@0
11+
inputs:
12+
versionSpec: '10.x'
13+
displayName: 'Install Node.js'
14+
15+
- script: |
16+
npm install
17+
npm run build
18+
npm run build-storybook
19+
displayName: 'NPM install and build'
20+
21+
- task: CopyFiles@2
22+
displayName: Move storybook package json
23+
inputs:
24+
SourceFolder: '.storybook'
25+
Contents: 'package.json'
26+
TargetFolder: 'storybook-static'
27+
OverWrite: true
28+
29+
- task: Npm@1
30+
displayName: Publish react-spaces-storybook
31+
inputs:
32+
command: 'publish'
33+
workingDir: 'storybook-static'
34+
publishEndpoint: 'NPM'
35+
36+
- task: Npm@1
37+
displayName: Publish react-spaces
38+
inputs:
39+
command: 'publish'
40+
publishEndpoint: 'NPM'

‎package.json‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,108 @@
1-
{
2-
"name": "react-spaces",
3-
"version": "0.2.0-beta.2",
4-
"main": "dist/index.js",
5-
"module": "dist/es/index.js",
6-
"types": "dist/index.d.ts",
7-
"files": [
8-
"dist/**/*.*"
9-
],
10-
"repository": "github:aeagle/react-spaces",
11-
"author": {
12-
"name": "Allan Eagle",
13-
"url": "https://www.allaneagle.com"
14-
},
15-
"bugs": "https://github.com/aeagle/react-spaces/issues",
16-
"homepage": "https://www.allaneagle.com/projects/react-spaces",
17-
"keywords": [
18-
"react",
19-
"reactjs",
20-
"reactjs components",
21-
"component library",
22-
"components",
23-
"web",
24-
"web ui",
25-
"javascript library"
26-
],
27-
"license": "MIT",
28-
"description": "An easy to understand and nestable layout system, React Spaces allow you to divide a page or container into anchored, scrollable and resizable spaces enabling you to build desktop type user interfaces in the browser.",
29-
"dependencies": {
30-
"css-element-queries": "^1.2.1"
31-
},
32-
"devDependencies": {
33-
"@babel/core": "^7.5.5",
34-
"@storybook/addon-actions": "^6.0.5",
35-
"@storybook/addon-docs": "^6.0.5",
36-
"@storybook/addon-knobs": "^6.0.5",
37-
"@storybook/addon-links": "^6.0.5",
38-
"@storybook/addons": "^6.0.5",
39-
"@storybook/react": "^6.0.5",
40-
"@testing-library/jest-dom": "^5.5.0",
41-
"@testing-library/react": "^10.0.3",
42-
"@types/jest": "^24.0.15",
43-
"@types/node": "^12.6.8",
44-
"@types/prop-types": "^15.7.3",
45-
"@types/react": "^16.8.23",
46-
"@types/react-dom": "^16.8.4",
47-
"acorn": "^7.1.1",
48-
"awesome-typescript-loader": "^5.2.1",
49-
"babel-loader": "^8.0.6",
50-
"babel-plugin-external-helpers": "^6.22.0",
51-
"cssstyle": "^2.3.0",
52-
"jest": "^25.4.0",
53-
"jest-expect-message": "^1.0.2",
54-
"node-sass": "^4.14.1",
55-
"prettier": "^1.19.1",
56-
"react": "^16.13.1",
57-
"react-docgen-typescript-loader": "^3.7.0",
58-
"react-dom": "^16.13.1",
59-
"rollup": "^1.19.4",
60-
"rollup-plugin-babel": "^4.3.3",
61-
"rollup-plugin-commonjs": "^10.0.2",
62-
"rollup-plugin-node-resolve": "^5.2.0",
63-
"rollup-plugin-postcss": "^2.0.3",
64-
"rollup-plugin-replace": "^2.2.0",
65-
"rollup-plugin-sourcemaps": "^0.4.2",
66-
"rollup-plugin-typescript2": "^0.22.1",
67-
"rollup-plugin-uglify": "^6.0.4",
68-
"rollup-watch": "^4.3.1",
69-
"sass-loader": "^8.0.2",
70-
"ts-jest": "^25.4.0",
71-
"ts-loader": "^6.2.1",
72-
"tslib": "^1.10.0",
73-
"typescript": "^3.5.3"
74-
},
75-
"resolutions": {
76-
"cssstyle": "2.3.0"
77-
},
78-
"peerDependencies": {
79-
"react": "^16.8.0",
80-
"react-dom": "^16.8.0",
81-
"prop-types": "^15.7.2"
82-
},
83-
"scripts": {
84-
"preinstall": "npx npm-force-resolutions",
85-
"start": "rollup -c -w",
86-
"build": "npm run build:prod",
87-
"build:prod": "rollup -c",
88-
"publish:beta": "npm publish --tag beta",
89-
"storybook": "start-storybook -p 6006",
90-
"build-storybook": "build-storybook",
91-
"test": "jest"
92-
},
93-
"eslintConfig": {
94-
"extends": "react-app"
95-
},
96-
"browserslist": {
97-
"production": [
98-
">0.2%",
99-
"not dead",
100-
"not op_mini all"
101-
],
102-
"development": [
103-
"last 1 chrome version",
104-
"last 1 firefox version",
105-
"last 1 safari version"
106-
]
107-
}
108-
}
1+
{
2+
"name": "react-spaces",
3+
"version": "0.2.0-beta.2",
4+
"main": "dist/index.js",
5+
"module": "dist/es/index.js",
6+
"types": "dist/index.d.ts",
7+
"files": [
8+
"dist/**/*.*"
9+
],
10+
"repository": "github:aeagle/react-spaces",
11+
"author": {
12+
"name": "Allan Eagle",
13+
"url": "https://www.allaneagle.com"
14+
},
15+
"bugs": "https://github.com/aeagle/react-spaces/issues",
16+
"homepage": "https://www.allaneagle.com/projects/react-spaces",
17+
"keywords": [
18+
"react",
19+
"reactjs",
20+
"reactjs components",
21+
"component library",
22+
"components",
23+
"web",
24+
"web ui",
25+
"javascript library"
26+
],
27+
"license": "MIT",
28+
"description": "An easy to understand and nestable layout system, React Spaces allow you to divide a page or container into anchored, scrollable and resizable spaces enabling you to build desktop type user interfaces in the browser.",
29+
"dependencies": {
30+
"css-element-queries": "^1.2.1"
31+
},
32+
"devDependencies": {
33+
"@babel/core": "^7.5.5",
34+
"@storybook/addon-actions": "^6.0.5",
35+
"@storybook/addon-docs": "^6.0.5",
36+
"@storybook/addon-knobs": "^6.0.5",
37+
"@storybook/addon-links": "^6.0.5",
38+
"@storybook/addons": "^6.0.5",
39+
"@storybook/react": "^6.0.5",
40+
"@testing-library/jest-dom": "^5.5.0",
41+
"@testing-library/react": "^10.0.3",
42+
"@types/jest": "^24.0.15",
43+
"@types/node": "^12.6.8",
44+
"@types/prop-types": "^15.7.3",
45+
"@types/react": "^16.8.23",
46+
"@types/react-dom": "^16.8.4",
47+
"acorn": "^7.1.1",
48+
"awesome-typescript-loader": "^5.2.1",
49+
"babel-loader": "^8.0.6",
50+
"babel-plugin-external-helpers": "^6.22.0",
51+
"cssstyle": "^2.3.0",
52+
"jest": "^25.4.0",
53+
"jest-expect-message": "^1.0.2",
54+
"node-sass": "^4.14.1",
55+
"prettier": "^1.19.1",
56+
"react": "^16.13.1",
57+
"react-docgen-typescript-loader": "^3.7.0",
58+
"react-dom": "^16.13.1",
59+
"rollup": "^1.19.4",
60+
"rollup-plugin-babel": "^4.3.3",
61+
"rollup-plugin-commonjs": "^10.0.2",
62+
"rollup-plugin-node-resolve": "^5.2.0",
63+
"rollup-plugin-postcss": "^2.0.3",
64+
"rollup-plugin-replace": "^2.2.0",
65+
"rollup-plugin-sourcemaps": "^0.4.2",
66+
"rollup-plugin-typescript2": "^0.22.1",
67+
"rollup-plugin-uglify": "^6.0.4",
68+
"rollup-watch": "^4.3.1",
69+
"sass-loader": "^8.0.2",
70+
"ts-jest": "^25.4.0",
71+
"ts-loader": "^6.2.1",
72+
"tslib": "^1.10.0",
73+
"typescript": "^3.5.3"
74+
},
75+
"resolutions": {
76+
"cssstyle": "2.3.0"
77+
},
78+
"peerDependencies": {
79+
"react": "^16.8.0",
80+
"react-dom": "^16.8.0",
81+
"prop-types": "^15.7.2"
82+
},
83+
"scripts": {
84+
"preinstall": "npx npm-force-resolutions",
85+
"start": "rollup -c -w",
86+
"build": "npm run build:prod",
87+
"build:prod": "rollup -c",
88+
"publish:beta": "npm publish --tag beta",
89+
"storybook": "start-storybook -p 6006",
90+
"build-storybook": "build-storybook",
91+
"test": "jest"
92+
},
93+
"eslintConfig": {
94+
"extends": "react-app"
95+
},
96+
"browserslist": {
97+
"production": [
98+
">0.2%",
99+
"not dead",
100+
"not op_mini all"
101+
],
102+
"development": [
103+
"last 1 chrome version",
104+
"last 1 firefox version",
105+
"last 1 safari version"
106+
]
107+
}
108+
}

‎src/core-utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ISpaceDefinition, SizeUnit, ISize, Type } from "./core-types";
1+
import { ISpaceDefinition, SizeUnit, ISize } from "./core-types";
22

33
export function shortuuid() {
44
let firstPart = (Math.random() * 46656) | 0;

0 commit comments

Comments
 (0)