Merge branch 'main' into pagination-disable-change

carbon-design-system · Apr 15, 2021 · a6f56f3 · a6f56f3
2 parents 8614495 + 4198db6
commit a6f56f3
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/packages/feature-flags/package.json b/packages/feature-flags/package.json
@@ -11,6 +11,12 @@
     "directory": "packages/feature-flags"
   },
   "bugs": "https://github.com/carbon-design-system/carbon/issues",
+  "files": [
+    "es",
+    "lib",
+    "scss",
+    "index.scss"
+  ],
   "keywords": [
     "ibm",
     "carbon",

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -7292,6 +7292,23 @@ Map {
     },
     "render": [Function],
   },
+  "unstable_FeatureFlags" => Object {
+    "propTypes": Object {
+      "children": Object {
+        "type": "node",
+      },
+      "flags": Object {
+        "args": Array [
+          Object {
+            "type": "bool",
+          },
+        ],
+        "type": "objectOf",
+      },
+    },
+  },
+  "unstable_useFeatureFlag" => Object {},
+  "unstable_useFeatureFlags" => Object {},
   "unstable_PageSelector" => Object {
     "defaultProps": Object {
       "className": null,

diff --git a/packages/react/src/__tests__/index-test.js b/packages/react/src/__tests__/index-test.js
@@ -201,13 +201,16 @@ describe('Carbon Components React', () => {
         "unstable_ContextMenuItem",
         "unstable_ContextMenuRadioGroup",
         "unstable_ContextMenuSelectableItem",
+        "unstable_FeatureFlags",
         "unstable_Heading",
         "unstable_PageSelector",
         "unstable_Pagination",
         "unstable_Section",
         "unstable_TreeNode",
         "unstable_TreeView",
         "unstable_useContextMenu",
+        "unstable_useFeatureFlag",
+        "unstable_useFeatureFlags",
       ]
     `);
   });

diff --git a/packages/react/src/index.js b/packages/react/src/index.js
@@ -201,6 +201,11 @@ export {
 } from './components/UIShell';
 
 // Experimental
+export {
+  FeatureFlags as unstable_FeatureFlags,
+  useFeatureFlag as unstable_useFeatureFlag,
+  useFeatureFlags as unstable_useFeatureFlags,
+} from './components/FeatureFlags';
 export {
   PageSelector as unstable_PageSelector,
   Pagination as unstable_Pagination,