carbon-addons-iot-react 5.6.4 → 5.6.5

package/es/components/Table/TableToolbar/TableToolbar.js

@@ -7,13 +7,17 @@ import isNil from '../../../node_modules/lodash-es/isNil.js';
 import 'core-js/modules/es.symbol.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.array.includes.js';
 import 'core-js/modules/es.array.map.js';
+import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.function.name.js';
 import 'core-js/modules/es.object.get-own-property-descriptor.js';
 import 'core-js/modules/es.object.get-own-property-descriptors.js';
 import 'core-js/modules/es.object.keys.js';
 import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/es.promise.js';
 import 'core-js/modules/es.regexp.exec.js';
+import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.string.search.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import React__default, { useMemo } from 'react';
@@ -250,6 +254,72 @@ var TableToolbar = function TableToolbar(_ref) {
   var visibleToolbarActions = actions.filter(function (action) {
     return !action.isOverflow && action.hidden !== true;
   });
+
+  // Extract TableViewDropdown from customToolbarContent
+  var _useMemo = useMemo(function () {
+      var _customToolbarContent;
+      if (!customToolbarContent) {
+        return {
+          tableViewDropdown: null,
+          otherToolbarContent: null
+        };
+      }
+
+      // Helper function to check if a child is TableViewDropdown
+      var isTableViewDropdown = function isTableViewDropdown(child) {
+        if (!child) return false;
+
+        // Check by key (most reliable for wrapped components)
+        if (child.key && typeof child.key === 'string' && child.key.includes('table-view-dropdown')) {
+          return true;
+        }
+
+        // Check by type properties
+        if (child.type) {
+          // Check by displayName
+          if (child.type.displayName === 'TableViewDropdown') return true;
+
+          // Check by function name
+          if (child.type.name === 'TableViewDropdown') return true;
+        }
+
+        // Check by props (TableViewDropdown has specific props like 'views', 'selectedViewId')
+        if (child.props && (child.props.views !== undefined || child.props.selectedViewId !== undefined || child.props.selectedViewEdited !== undefined)) {
+          return true;
+        }
+        return false;
+      };
+
+      // Extract children from Fragment if present
+      var contentToProcess = customToolbarContent;
+
+      // Check if it's a Fragment (React.Fragment has type as Symbol or Fragment)
+      if (customToolbarContent.type === React__default.Fragment && (_customToolbarContent = customToolbarContent.props) !== null && _customToolbarContent !== void 0 && _customToolbarContent.children) {
+        contentToProcess = customToolbarContent.props.children;
+      }
+
+      // Convert to array (handles both single element and multiple children)
+      var contentArray = React__default.Children.toArray(contentToProcess);
+
+      // Always check the first element
+      var firstElement = contentArray[0];
+      if (isTableViewDropdown(firstElement)) {
+        // First element is TableViewDropdown - extract it, rest is other content
+        var remainingContent = contentArray.slice(1);
+        return {
+          tableViewDropdown: firstElement,
+          otherToolbarContent: remainingContent.length > 0 ? remainingContent : null
+        };
+      }
+
+      // First element is not TableViewDropdown - all content is other content
+      return {
+        tableViewDropdown: null,
+        otherToolbarContent: contentArray.length > 0 ? contentArray : null
+      };
+    }, [customToolbarContent]),
+    tableViewDropdown = _useMemo.tableViewDropdown,
+    otherToolbarContent = _useMemo.otherToolbarContent;
   var visibleBatchActions = batchActions.filter(function (action) {
     return !action.isOverflow && action.hidden !== true;
   });
@@ -389,7 +459,7 @@ var TableToolbar = function TableToolbar(_ref) {
   , {
     "data-testid": "".concat(testID || testId, "-content"),
     className: "".concat(iotPrefix, "--table-toolbar-content")
-  }, hasSearch ? /*#__PURE__*/React__default.createElement(TableToolbarSearch, {
+  }, tableViewDropdown || null, hasSearch ? /*#__PURE__*/React__default.createElement(TableToolbarSearch, {
     tableId: tableId,
     i18n: i18n,
     options: {
@@ -532,8 +602,8 @@ var TableToolbar = function TableToolbar(_ref) {
     itemText: "",
     disabled: true
   })) : null,
-  // Default card header actions should be to the right of the table-specific actions
-  customToolbarContent || null));
+  // Render other custom toolbar content
+  otherToolbarContent || null));
 };
 TableToolbar.propTypes = propTypes;
 TableToolbar.defaultProps = defaultProps;

package/lib/components/Table/TableToolbar/TableToolbar.js

@@ -9,13 +9,17 @@ var isNil = require('../../../node_modules/lodash-es/isNil.js');
 require('core-js/modules/es.symbol.js');
 require('core-js/modules/es.array.concat.js');
 require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.array.includes.js');
 require('core-js/modules/es.array.map.js');
+require('core-js/modules/es.array.slice.js');
 require('core-js/modules/es.function.name.js');
 require('core-js/modules/es.object.get-own-property-descriptor.js');
 require('core-js/modules/es.object.get-own-property-descriptors.js');
 require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/es.promise.js');
 require('core-js/modules/es.regexp.exec.js');
+require('core-js/modules/es.string.includes.js');
 require('core-js/modules/es.string.search.js');
 require('core-js/modules/web.dom-collections.for-each.js');
 var React = require('react');
@@ -262,6 +266,72 @@ var TableToolbar = function TableToolbar(_ref) {
   var visibleToolbarActions = actions.filter(function (action) {
     return !action.isOverflow && action.hidden !== true;
   });
+
+  // Extract TableViewDropdown from customToolbarContent
+  var _useMemo = React.useMemo(function () {
+      var _customToolbarContent;
+      if (!customToolbarContent) {
+        return {
+          tableViewDropdown: null,
+          otherToolbarContent: null
+        };
+      }
+
+      // Helper function to check if a child is TableViewDropdown
+      var isTableViewDropdown = function isTableViewDropdown(child) {
+        if (!child) return false;
+
+        // Check by key (most reliable for wrapped components)
+        if (child.key && typeof child.key === 'string' && child.key.includes('table-view-dropdown')) {
+          return true;
+        }
+
+        // Check by type properties
+        if (child.type) {
+          // Check by displayName
+          if (child.type.displayName === 'TableViewDropdown') return true;
+
+          // Check by function name
+          if (child.type.name === 'TableViewDropdown') return true;
+        }
+
+        // Check by props (TableViewDropdown has specific props like 'views', 'selectedViewId')
+        if (child.props && (child.props.views !== undefined || child.props.selectedViewId !== undefined || child.props.selectedViewEdited !== undefined)) {
+          return true;
+        }
+        return false;
+      };
+
+      // Extract children from Fragment if present
+      var contentToProcess = customToolbarContent;
+
+      // Check if it's a Fragment (React.Fragment has type as Symbol or Fragment)
+      if (customToolbarContent.type === React__default.default.Fragment && (_customToolbarContent = customToolbarContent.props) !== null && _customToolbarContent !== void 0 && _customToolbarContent.children) {
+        contentToProcess = customToolbarContent.props.children;
+      }
+
+      // Convert to array (handles both single element and multiple children)
+      var contentArray = React__default.default.Children.toArray(contentToProcess);
+
+      // Always check the first element
+      var firstElement = contentArray[0];
+      if (isTableViewDropdown(firstElement)) {
+        // First element is TableViewDropdown - extract it, rest is other content
+        var remainingContent = contentArray.slice(1);
+        return {
+          tableViewDropdown: firstElement,
+          otherToolbarContent: remainingContent.length > 0 ? remainingContent : null
+        };
+      }
+
+      // First element is not TableViewDropdown - all content is other content
+      return {
+        tableViewDropdown: null,
+        otherToolbarContent: contentArray.length > 0 ? contentArray : null
+      };
+    }, [customToolbarContent]),
+    tableViewDropdown = _useMemo.tableViewDropdown,
+    otherToolbarContent = _useMemo.otherToolbarContent;
   var visibleBatchActions = batchActions.filter(function (action) {
     return !action.isOverflow && action.hidden !== true;
   });
@@ -401,7 +471,7 @@ var TableToolbar = function TableToolbar(_ref) {
   , {
     "data-testid": "".concat(testID || testId, "-content"),
     className: "".concat(iotPrefix, "--table-toolbar-content")
-  }, hasSearch ? /*#__PURE__*/React__default.default.createElement(TableToolbarSearch, {
+  }, tableViewDropdown || null, hasSearch ? /*#__PURE__*/React__default.default.createElement(TableToolbarSearch, {
     tableId: tableId,
     i18n: i18n,
     options: {
@@ -544,8 +614,8 @@ var TableToolbar = function TableToolbar(_ref) {
     itemText: "",
     disabled: true
   })) : null,
-  // Default card header actions should be to the right of the table-specific actions
-  customToolbarContent || null));
+  // Render other custom toolbar content
+  otherToolbarContent || null));
 };
 TableToolbar.propTypes = propTypes;
 TableToolbar.defaultProps = defaultProps;

package/package.json

@@ -353,7 +353,7 @@
     "whatwg-fetch": "^3.0.0"
   },
   "sideEffects": false,
-  "version": "5.6.4",
+  "version": "5.6.5",
   "resolutions": {
     "chokidar": "3.3.1",
     "react-grid-layout": "1.2.2",