chore: create new component tree

Author: iobuhov

packages/pluggableWidgets/datagrid-dropdown-filter-web/src/DatagridDropdownFilter.tsx

@@ -1,42 +1,48 @@
 import { createElement, ReactElement } from "react";
 import { withPreloader } from "@mendix/widget-plugin-platform/hoc/withPreloader";
 import { DatagridDropdownFilterContainerProps } from "../typings/DatagridDropdownFilterProps";
-import { StaticFilterContainer } from "./components/StaticFilterContainer";
-import { withSelectFilterAPI, Select_FilterAPIv2 } from "./hocs/withSelectFilterAPI";
-import { RefFilterContainer } from "./components/RefFilterContainer";
-
-function Container(props: DatagridDropdownFilterContainerProps & Select_FilterAPIv2): React.ReactElement {
-    const commonProps = {
-        ariaLabel: props.ariaLabel?.value,
-        className: props.class,
-        tabIndex: props.tabIndex,
-        styles: props.style,
-        onChange: props.onChange,
-        valueAttribute: props.valueAttribute,
-        parentChannelName: props.parentChannelName,
-        name: props.name,
-        multiselect: props.multiSelect,
-        emptyCaption: props.emptyOptionCaption?.value,
-        defaultValue: props.defaultValue?.value,
-        filterable: props.filterable,
-        selectionMethod: props.selectionMethod,
-        selectedItemsStyle: props.selectedItemsStyle,
-        clearable: props.clearable
-    };
-
-    if (props.filterStore.storeType === "refselect") {
-        return <RefFilterContainer {...commonProps} filterStore={props.filterStore} />;
-    }
+import { AttrFilter } from "./components/AttrFilter";
 
-    return (
-        <StaticFilterContainer {...commonProps} filterStore={props.filterStore} filterOptions={props.filterOptions} />
-    );
-}
+// function Container(props: DatagridDropdownFilterContainerProps & Select_FilterAPIv2): React.ReactElement {
+//     const commonProps = {
+//         ariaLabel: props.ariaLabel?.value,
+//         className: props.class,
+//         tabIndex: props.tabIndex,
+//         styles: props.style,
+//         onChange: props.onChange,
+//         valueAttribute: props.valueAttribute,
+//         parentChannelName: props.parentChannelName,
+//         name: props.name,
+//         multiselect: props.multiSelect,
+//         emptyCaption: props.emptyOptionCaption?.value,
+//         defaultValue: props.defaultValue?.value,
+//         filterable: props.filterable,
+//         selectionMethod: props.selectionMethod,
+//         selectedItemsStyle: props.selectedItemsStyle,
+//         clearable: props.clearable
+//     };
+
+//     if (props.filterStore.storeType === "refselect") {
+//         return <RefFilterContainer {...commonProps} filterStore={props.filterStore} />;
+//     }
+
+//     return (
+//         <StaticFilterContainer {...commonProps} filterStore={props.filterStore} filterOptions={props.filterOptions} />
+//     );
+// }
 
-const container = withPreloader(Container, props => props.defaultValue?.status === "loading");
+const DatagridDropdownFilter = withPreloader(Container, props => props.defaultValue?.status === "loading");
 
-const Widget = withSelectFilterAPI(container);
+export default DatagridDropdownFilter;
+
+function Container(props: DatagridDropdownFilterContainerProps): ReactElement {
+    if (props.baseType === "attr") {
+        return <AttrFilter {...props} />;
+    }
+
+    return <RefFilter {...props} />;
+}
 
-export default function DatagridDropdownFilter(props: DatagridDropdownFilterContainerProps): ReactElement {
-    return <Widget {...props} />;
+function RefFilter(props: DatagridDropdownFilterContainerProps): ReactElement {
+    return <div key={props.name} />;
 }

packages/pluggableWidgets/datagrid-dropdown-filter-web/src/components/AttrFilter.tsx

@@ -0,0 +1,34 @@
+import { ReactElement, createElement } from "react";
+import {
+    StaticFilterContainer,
+    StaticFilterContainerProps
+} from "@mendix/widget-plugin-dropdown-filter/containers/StaticFilterContainer";
+import {
+    withParentProvidedStore,
+    Select_FilterAPIv2
+} from "@mendix/widget-plugin-filtering/hocs/withParentProvidedStore";
+
+import { DatagridDropdownFilterContainerProps } from "../../typings/DatagridDropdownFilterProps";
+
+export function AttrFilter(props: DatagridDropdownFilterContainerProps): ReactElement {
+    return <AutoAttrFilter {...props} />;
+}
+
+const AutoAttrFilter = withParentProvidedStore(function AutoAttrFilter(
+    props: DatagridDropdownFilterContainerProps & Select_FilterAPIv2
+): ReactElement {
+    return <StaticFilterContainer {...mapProps(props)} />;
+});
+
+function mapProps(props: DatagridDropdownFilterContainerProps & Select_FilterAPIv2): StaticFilterContainerProps {
+    return {
+        ...props,
+        multiselect: props.multiSelect,
+        ariaLabel: props.ariaLabel?.value,
+        className: props.class,
+        styles: props.style,
+        emptyCaption: props.emptyOptionCaption?.value,
+        defaultValue: props.defaultValue?.value,
+        parentChannelName: props.parentChannelName
+    };
+}