From 8bec682eab0d196976390ab84d04cd22b37ec402 Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Sat, 30 Jun 2018 19:36:55 +0800 Subject: [PATCH] fix(resize): limit minimal width & handler show up conditions --- src/components/Resizable.js | 2 +- src/components/ResizeHandler.js | 2 +- src/content.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Resizable.js b/src/components/Resizable.js index da6114d..bb92be8 100644 --- a/src/components/Resizable.js +++ b/src/components/Resizable.js @@ -12,7 +12,7 @@ export default class Resizable extends React.PureComponent { size: this.props.baseSize, } - onResize = size => this.setState({ size }) + onResize = size => this.setState({ size: Math.max(this.props.baseSize, size) }) render() { const { className, children } = this.props diff --git a/src/components/ResizeHandler.js b/src/components/ResizeHandler.js index ea15733..b79a6d8 100644 --- a/src/components/ResizeHandler.js +++ b/src/components/ResizeHandler.js @@ -40,7 +40,7 @@ export default class ResizeHandler extends React.PureComponent { onPointerUp = () => { this.pointerDown = false - this.baseSize += this.delta + this.baseSize = Math.max(this.baseSize + this.delta, this.props.size) this.unsubscribeEvents() } diff --git a/src/content.less b/src/content.less index 9e8f2a5..4d61099 100644 --- a/src/content.less +++ b/src/content.less @@ -139,7 +139,7 @@ user-select: none; border-left: 1px solid #e1e4e8; - @media screen and (min-width: @min-screen-width) { + @media screen and (min-width: (@min-screen-width + @side-bar-base-width + @resize-handler-width * 2)) { display: flex; align-items: center; }