Skip to content

Commit d4ced35

Browse files
committed
Fixes
1 parent 168a3ee commit d4ced35

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-spaces",
3-
"version": "0.2.0-beta.7",
3+
"version": "0.2.0-beta.9",
44
"main": "dist/index.js",
55
"module": "dist/es/index.js",
66
"types": "dist/index.d.ts",

src/components/Anchored.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ICommonProps, SizeUnit, Type, AnchorType } from "../core-types";
1+
import { ICommonProps, SizeUnit, Type, AnchorType, ResizeHandlePlacement } from "../core-types";
22
import * as React from "react";
33
import { Space } from "./Space";
44
import * as PropTypes from "prop-types";
@@ -9,7 +9,7 @@ interface IAnchorProps extends ICommonProps {
99
order?: number;
1010
resizable?: boolean;
1111
handleSize?: number;
12-
overlayHandle?: boolean;
12+
handlePlacement?: ResizeHandlePlacement;
1313
minimumSize?: number;
1414
maximumSize?: number;
1515
onResizeStart?: () => void | boolean;
@@ -23,7 +23,7 @@ export const anchoredProps = {
2323
order: PropTypes.number,
2424
resizable: PropTypes.bool,
2525
handleSize: PropTypes.number,
26-
overlayHandle: PropTypes.bool,
26+
handlePlacement: PropTypes.oneOf([ResizeHandlePlacement.Inside, ResizeHandlePlacement.OverlayBoundary, ResizeHandlePlacement.OverlayInside]),
2727
minimumSize: PropTypes.number,
2828
maximumSize: PropTypes.number,
2929
onResizeStart: PropTypes.func,
@@ -37,7 +37,7 @@ export const resizableProps = {
3737
size: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
3838
order: PropTypes.number,
3939
handleSize: PropTypes.number,
40-
overlayHandle: PropTypes.bool,
40+
handlePlacement: PropTypes.oneOf([ResizeHandlePlacement.Inside, ResizeHandlePlacement.OverlayBoundary, ResizeHandlePlacement.OverlayInside]),
4141
minimumSize: PropTypes.number,
4242
maximumSize: PropTypes.number,
4343
onResizeStart: PropTypes.func,

src/core.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,13 @@ export function createStore(): ISpaceStore {
382382
},
383383
} as ISpaceDefinition;
384384

385-
newSpace.anchoredChildren = (anchor, zIndex) =>
386-
newSpace.children.filter((s) => s.type === Type.Anchored && s.anchor === anchor && s.zIndex === zIndex);
385+
newSpace.anchoredChildren = (anchor, zIndex) => {
386+
const children = newSpace.children.filter((s) => s.type === Type.Anchored && s.anchor === anchor && s.zIndex === zIndex);
387+
const orderedChildren = children.filter(c => c.order !== undefined);
388+
const unorderedChildren = children.filter(c => c.order === undefined);
389+
var maxOrder = orderedChildren.length > 0 ? orderedChildren.map(a => a.order).reduce((a, b) => Math.max(a, b)) : 0;
390+
return [...orderedChildren, ...unorderedChildren.map((c, idx) => ({...c, ...{ order: maxOrder + idx + 1 }}))];
391+
}
387392

388393
newSpace.adjustLeft = (adjusted) => {
389394
if (adjustmentsEqual(newSpace.left.adjusted, adjusted)) {

src/styles.css

+2-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535

3636
.spaces-resize-handle:before {
37-
content: '';
37+
content: "";
3838
position: absolute;
3939
left: 0;
4040
top: 0;
@@ -44,11 +44,8 @@
4444
}
4545

4646
.spaces-resize-handle:after {
47-
cursor: default;
48-
content: '';
47+
content: "";
4948
position: absolute;
50-
background-color: blue;
51-
opacity: 0.2;
5249
z-index: 1;
5350
}
5451

0 commit comments

Comments
 (0)