Merge pull request #124 from Gerhut/fix-custom-props

Fix Custom.propTypes

Author: aeagle

src/components/Custom.tsx

@@ -4,6 +4,7 @@ import { Space } from "./Space";
 import * as PropTypes from "prop-types";
 import { IReactSpaceCommonProps } from "../core-react";
 import { anchoredProps, IAnchorProps } from "./Anchored";
+import { omit } from '../core-utils';
 
 type ICustomProps = Omit<IReactSpaceCommonProps & IAnchorProps, "size"> & {
 	type?: Type;
@@ -22,7 +23,7 @@ type ICustomProps = Omit<IReactSpaceCommonProps & IAnchorProps, "size"> & {
 	resizeTypes?: ResizeType[];
 };
 
-const customProps = {
+const customProps = omit({
 	...anchoredProps,
 	...{
 		type: PropTypes.oneOf([Type.Positioned, Type.Fill, Type.Anchored]),
@@ -38,7 +39,7 @@ const customProps = {
 		height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 		resizeTypes: PropTypes.array,
 	},
-};
+}, 'size');
 
 export const Custom: React.FC<ICustomProps> = ({
 	children,

src/core-utils.ts

@@ -1,5 +1,16 @@
 import { ISpaceDefinition, SizeUnit, ISize, ResizeHandlePlacement, Type } from "./core-types";
 
+export function omit<K extends string, T extends Record<K, unknown>>(object: T, ...keys: K[]): Omit<T, K> {
+	const keySet = new Set<string>(keys)
+	const result = Object.create(null) as Omit<T, K>
+	for (const key in Object.keys(object)) {
+		if (!keySet.has(key)) {
+			result[key] = object[key]
+		}
+	} 
+	return result
+}
+
 export function shortuuid() {
 	let firstPart = (Math.random() * 46656) | 0;
 	let secondPart = (Math.random() * 46656) | 0;