Skip to content

Commit 9d6e69e

Browse files
authored
Merge pull request #13 from aeagle/patch/5-resize-constraints
Patch/5 resize constraints
2 parents ea8dd6d + 8a4513b commit 9d6e69e

File tree

6 files changed

+31
-90
lines changed

6 files changed

+31
-90
lines changed

demo/src/docs/Docs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Button, Icon, Menu } from 'antd';
44
import 'antd/dist/antd.css';
55
import { GettingStarted } from './GettingStarted';
66
import { Types } from './Types';
7-
import { Anchored } from '../ui-demo/Anchored';
7+
import { Anchored } from './Anchored';
88
import { Resizable } from './Resizable';
99
import { Nested } from './Nested';
1010
import { Scrollable } from './Scrollable';

demo/src/docs/Resizable.tsx

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,31 @@ export const Resizable = () => {
8787
{
8888
"const App = () => (\r\n" +
8989
" <Space.Fixed height={400}>\r\n" +
90-
" <Space.LeftResizable size={100} minimumSize={50} maximumSize={150} />\r\n" +
90+
" <Space.LeftResizable size=\"20%\" minimumSize={50} maximumSize={150} />\r\n" +
9191
" <Space.Fill />\r\n" +
92-
" <Space.RightResizable size={100} minimumSize={50} maximumSize={150} />\r\n" +
92+
" <Space.RightResizable size=\"20%\" minimumSize={50} maximumSize={150} />\r\n" +
9393
" </Space.Fixed>\r\n" +
9494
")"
9595
}
9696
</SyntaxHighlighter>
9797

9898
<Space.Fixed height={400}>
99-
<Space.LeftResizable trackSize={true} size={100} minimumSize={50} maximumSize={150} style={{ backgroundColor: '#e0eee0' }}>
100-
{Description("Left", "L")}
99+
<Space.LeftResizable trackSize={true} size="20%" minimumSize={50} maximumSize={150} style={{ backgroundColor: '#e0eee0' }}>
100+
{Description("Left", "L")}
101101
</Space.LeftResizable>
102-
<Space.Fill trackSize={true} style={{ backgroundColor: '#eee0e0' }}>
103-
{Description("Fill", "F")}
104-
</Space.Fill>
105-
<Space.RightResizable trackSize={true} size={100} minimumSize={50} maximumSize={150} style={{ backgroundColor: '#e0eee0' }}>
106-
{Description("Right", "R")}
102+
<Space.Fill>
103+
<Space.TopResizable trackSize={true} size="20%" minimumSize={50} maximumSize={150} style={{ backgroundColor: '#e0eeee' }}>
104+
{Description("Top", "T")}
105+
</Space.TopResizable>
106+
<Space.Fill trackSize={true} style={{ backgroundColor: '#eee0e0' }}>
107+
{Description("Fill", "F")}
108+
</Space.Fill>
109+
<Space.BottomResizable trackSize={true} size="20%" minimumSize={50} maximumSize={150} style={{ backgroundColor: '#e0eeee' }}>
110+
{Description("Bottom", "B")}
111+
</Space.BottomResizable>
112+
</Space.Fill>
113+
<Space.RightResizable trackSize={true} size="20%" minimumSize={50} maximumSize={150} style={{ backgroundColor: '#e0eee0' }}>
114+
{Description("Right", "R")}
107115
</Space.RightResizable>
108116
</Space.Fixed>
109117

demo/src/docs/VersionHistory.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ export const VersionHistory = () => {
55
<>
66
<h2 id="changes">Version history</h2>
77

8+
<div>
9+
<h3>0.1.6</h3>
10+
<ul>
11+
<li>Fixed resize minimum and maximum constraints</li>
12+
</ul>
13+
</div>
814
<div>
915
<h3>0.1.5</h3>
1016
<ul>

demo/src/ui-demo/Anchored.tsx

Lines changed: 0 additions & 76 deletions
This file was deleted.

react-spaces/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "react-spaces",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"main": "dist/index.js",
55
"author": {
66
"name": "Allan Eagle"
77
},
8-
"license": "ISC",
8+
"license": "MIT",
99
"description": "React Layout Components",
1010
"dependencies": {
1111
"css-element-queries": "^1.2.1",

react-spaces/src/components/Space.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ class Space extends React.Component<AllProps, IState> {
100100

101101
const currentRect = this.divElementRef.current.getBoundingClientRect();
102102
this.setState({
103-
parsedSize: !this.state.parsedSize ? currentRect.width : this.state.parsedSize,
103+
parsedSize:
104+
!this.state.parsedSize ?
105+
this.isHorizontalSpace() ? currentRect.width : currentRect.height :
106+
this.state.parsedSize,
104107
currentWidth: currentRect.width,
105108
currentHeight: currentRect.height
106109
});
@@ -246,7 +249,7 @@ class Space extends React.Component<AllProps, IState> {
246249
<>
247250
<Resizable
248251
type={resizeType}
249-
minimumAdjust={ -(this.props.size || 0) + (this.props.minimumSize || 20) }
252+
minimumAdjust={ -(this.state.parsedSize || 0) + (this.props.minimumSize || 20) }
250253
maximumAdjust={ this.props.maximumSize ? (this.props.maximumSize - (this.state.parsedSize || 0)) : undefined}
251254
onResize={(adjustedSize) => {
252255
this.setState(

0 commit comments

Comments
 (0)