@kwiz/fluentui 1.0.24 → 1.0.25

package/dist/helpers/drag-drop/drag-drop-container.d.ts

@@ -1,4 +1,4 @@
-import { iDraggedItemType, iDraggableProps } from "./use-draggable";
+import { iDraggableProps, iDraggedItemType } from "./use-draggable";
 import { iDroppableProps } from "./use-droppable";
 interface one<DragItemType extends iDraggedItemType<string>> {
     dragInfo: iDraggableProps<DragItemType>;
@@ -6,7 +6,7 @@ interface one<DragItemType extends iDraggedItemType<string>> {
 interface other<DropInfoTypes extends string = never, DropInfoItemTypes extends iDraggedItemType<DropInfoTypes> = never> {
     dropInfo: iDroppableProps<DropInfoTypes, DropInfoItemTypes>;
 }
-type iDragDropProps<DragItemType extends iDraggedItemType<string>, DropInfoTypes extends string = never, DropInfoItemTypes extends iDraggedItemType<DropInfoTypes> = never> = one<DragItemType> | other<DropInfoTypes, DropInfoItemTypes> | (one<DragItemType> & other<DropInfoTypes, DropInfoItemTypes>);
+type iDragDropProps<DragItemType extends iDraggedItemType<string>, DropInfoTypes extends string = never, DropInfoItemTypes extends iDraggedItemType<DropInfoTypes> = never> = one<DragItemType> & Partial<other<DropInfoTypes, DropInfoItemTypes>> | Partial<one<DragItemType>> & other<DropInfoTypes, DropInfoItemTypes> | (one<DragItemType> & other<DropInfoTypes, DropInfoItemTypes>);
 type iProps<DragItemType extends iDraggedItemType<string>, DropInfoTypes extends string, DropInfoItemTypes extends iDraggedItemType<DropInfoTypes>> = Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
     onDraggingClassName?: string;
     onDragOverClassName?: string;

package/dist/helpers/drag-drop/drag-drop-container.js

@@ -8,6 +8,11 @@ export function DragDropContainer(props) {
         classNames.push(props.onDraggingClassName);
     if (drop.isOver && props.onDragOverClassName)
         classNames.push(props.onDragOverClassName);
-    return _jsx("div", Object.assign({}, (props || {}), { ref: dragDropRef, className: classNames.join(' '), children: props.children }));
+    const propsWithoutExtras = Object.assign({}, props);
+    delete propsWithoutExtras.dragInfo;
+    delete propsWithoutExtras.dropInfo;
+    delete propsWithoutExtras.onDraggingClassName;
+    delete propsWithoutExtras.onDragOverClassName;
+    return _jsx("div", Object.assign({}, propsWithoutExtras, { ref: dragDropRef, className: classNames.join(' '), children: props.children }));
 }
 //# sourceMappingURL=drag-drop-container.js.map

package/dist/helpers/drag-drop/drag-drop-container.js.map

@@ -1 +1 @@
-{"version":3,"file":"drag-drop-container.js","sourceRoot":"","sources":["../../../src/helpers/drag-drop/drag-drop-container.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAgCzD,MAAM,UAAU,iBAAiB,CAI/B,KAAsF;IAEpF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAa,mBAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpG,IAAI,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,mBAAmB;QAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC7F,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,mBAAmB;QAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAEzF,OAAO,8BAAS,CAAC,KAAK,IAAI,EAAE,CAAC,IAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,YAAG,KAAK,CAAC,QAAQ,IAAO,CAAC;AAC7G,CAAC"}
+{"version":3,"file":"drag-drop-container.js","sourceRoot":"","sources":["../../../src/helpers/drag-drop/drag-drop-container.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAgCzD,MAAM,UAAU,iBAAiB,CAI/B,KAAsF;IAEpF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE9D,MAAM,UAAU,GAAa,mBAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpG,IAAI,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,mBAAmB;QAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC7F,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,mBAAmB;QAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAEzF,MAAM,kBAAkB,qBACjB,KAAK,CACX,CAAC;IACF,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACnC,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACnC,OAAO,kBAAkB,CAAC,mBAAmB,CAAC;IAC9C,OAAO,kBAAkB,CAAC,mBAAmB,CAAC;IAE9C,OAAO,8BAAS,kBAAkB,IAAE,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,YAAG,KAAK,CAAC,QAAQ,IAAO,CAAC;AAClH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kwiz/fluentui",
-    "version": "1.0.24",
+    "version": "1.0.25",
     "description": "KWIZ common controls for FluentUI",
     "module": "dist/index.js",
     "types": "dist/index.d.ts",

package/src/helpers/drag-drop/drag-drop-container.tsx

@@ -1,6 +1,6 @@
 import { isNullOrEmptyString } from "@kwiz/common";
 import { useDragDropContext } from "./drag-drop-context";
-import { iDraggedItemType, iDraggableProps } from "./use-draggable";
+import { iDraggableProps, iDraggedItemType } from "./use-draggable";
 import { iDroppableProps } from "./use-droppable";
 
 interface one<DragItemType extends iDraggedItemType<string>> {
@@ -16,8 +16,8 @@ type iDragDropProps<
     DragItemType extends iDraggedItemType<string>,
     DropInfoTypes extends string = never,
     DropInfoItemTypes extends iDraggedItemType<DropInfoTypes> = never,
-> = one<DragItemType>
-    | other<DropInfoTypes, DropInfoItemTypes>
+> = one<DragItemType> & Partial<other<DropInfoTypes, DropInfoItemTypes>>
+    | Partial<one<DragItemType>> & other<DropInfoTypes, DropInfoItemTypes>
     | (one<DragItemType> & other<DropInfoTypes, DropInfoItemTypes>);
 
 type iProps<DragItemType extends iDraggedItemType<string>, DropInfoTypes extends string, DropInfoItemTypes extends iDraggedItemType<DropInfoTypes>> =
@@ -43,5 +43,13 @@ export function DragDropContainer<
     if (drag.isDragging && props.onDraggingClassName) classNames.push(props.onDraggingClassName);
     if (drop.isOver && props.onDragOverClassName) classNames.push(props.onDragOverClassName);
 
-    return <div {...(props || {})} ref={dragDropRef} className={classNames.join(' ')}>{props.children}</div>;
+    const propsWithoutExtras = {
+        ...props
+    };
+    delete propsWithoutExtras.dragInfo;
+    delete propsWithoutExtras.dropInfo;
+    delete propsWithoutExtras.onDraggingClassName;
+    delete propsWithoutExtras.onDragOverClassName;
+
+    return <div {...propsWithoutExtras} ref={dragDropRef} className={classNames.join(' ')}>{props.children}</div>;
 }