tinacms 1.2.0 → 1.2.1

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { useCMS, Form, GlobalFormPlugin, EventBus, Modal, ModalPopup, ModalHeader, ModalBody, ModalActions, Button, LoadingDots, useLocalStorage, TinaCMS, BranchSwitcherPlugin, BranchDataProvider, TinaProvider, TinaMediaStore, DummyMediaStore, Nav, LocalWarning, BillingWarning, Select, Input, ReactDateTimeWithStyles, textFieldClasses, Toggle, OverflowMenu, CursorPaginator, PopupModal, BaseTextField, wrapFieldsWithMeta, FormStatus, FormBuilder } from "@tinacms/toolkit";
+import { useCMS, Form, GlobalFormPlugin, EventBus, Modal, ModalPopup, ModalHeader, ModalBody, ModalActions, Button, LoadingDots, useLocalStorage, TinaCMS, BranchSwitcherPlugin, BranchDataProvider, TinaProvider, TinaMediaStore, DummyMediaStore, Nav, BranchBanner, LocalWarning, BillingWarning, Select, Input, ReactDateTimeWithStyles, textFieldClasses, Toggle, OverflowMenu, CursorPaginator, PopupModal, BaseTextField, wrapFieldsWithMeta, FormStatus, FormBuilder } from "@tinacms/toolkit";
 export * from "@tinacms/toolkit";
 export { MdxFieldPluginExtendible } from "@tinacms/toolkit";
 import * as G from "graphql";
@@ -2867,7 +2867,8 @@ const TinaCloudProvider = (props) => {
     if (branchingEnabled) {
       branchSwitcher = new BranchSwitcherPlugin({
         listBranches: handleListBranches,
-        createBranch: handleCreateBranch
+        createBranch: handleCreateBranch,
+        chooseBranch: setCurrentBranch
       });
       cms.plugins.add(branchSwitcher);
     }
@@ -3546,6 +3547,10 @@ var styles = `.tina-tailwind {
   --tw-border-opacity: 1;
   border-color: rgb(225 221 236 / var(--tw-border-opacity));
 }
+.tina-tailwind .border-gray-100 {
+  --tw-border-opacity: 1;
+  border-color: rgb(237 236 243 / var(--tw-border-opacity));
+}
 .tina-tailwind .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -3640,6 +3645,10 @@ var styles = `.tina-tailwind {
   padding-left: 12px;
   padding-right: 12px;
 }
+.tina-tailwind .py-3 {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
 .tina-tailwind .py-5 {
   padding-top: 20px;
   padding-bottom: 20px;
@@ -4876,20 +4885,33 @@ const LogoutPage = () => {
 const PageWrapper = ({
   children
 }) => {
+  var _a, _b;
+  const cms = useCMS();
+  const isLocalMode = (_b = (_a = cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode;
+  const [branchingEnabled, setBranchingEnabled] = React.useState(() => cms.flags.get("branch-switcher"));
+  React.useEffect(() => {
+    cms.events.subscribe("flag:set", ({ key, value }) => {
+      if (key === "branch-switcher") {
+        setBranchingEnabled(value);
+      }
+    });
+  }, [cms.events]);
   return /* @__PURE__ */ React.createElement("div", {
     className: "relative left-0 w-full h-full bg-gradient-to-b from-gray-50/50 to-gray-50 shadow-2xl overflow-y-auto transition-opacity duration-300 ease-out flex flex-col opacity-100"
-  }, children);
+  }, branchingEnabled && !isLocalMode && /* @__PURE__ */ React.createElement(BranchBanner, null), children);
 };
 const PageHeader = ({
   isLocalMode,
   children
-}) => /* @__PURE__ */ React.createElement(React.Fragment, null, isLocalMode && /* @__PURE__ */ React.createElement(LocalWarning, null), !isLocalMode && /* @__PURE__ */ React.createElement(BillingWarning, null), /* @__PURE__ */ React.createElement("div", {
-  className: "pt-12 px-12"
-}, /* @__PURE__ */ React.createElement("div", {
-  className: "w-full mx-auto max-w-screen-xl"
-}, /* @__PURE__ */ React.createElement("div", {
-  className: "w-full flex justify-between items-end"
-}, children))));
+}) => {
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, isLocalMode && /* @__PURE__ */ React.createElement(LocalWarning, null), !isLocalMode && /* @__PURE__ */ React.createElement(BillingWarning, null), /* @__PURE__ */ React.createElement("div", {
+    className: "pt-12 px-12"
+  }, /* @__PURE__ */ React.createElement("div", {
+    className: "w-full mx-auto max-w-screen-xl"
+  }, /* @__PURE__ */ React.createElement("div", {
+    className: "w-full flex justify-between items-end"
+  }, children))));
+};
 const PageBody = ({
   children
 }) => /* @__PURE__ */ React.createElement("div", {
@@ -5175,7 +5197,7 @@ const CollectionListPage = () => {
       }
     }, (collection, _loading, reFetchCollection, collectionExtra) => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-      const totalCount = collection.documents.totalCount;
+      collection.documents.totalCount;
       const documents = collection.documents.edges;
       const admin = cms.api.admin;
       const pageInfo = collection.documents.pageInfo;
@@ -5284,7 +5306,7 @@ const CollectionListPage = () => {
             setSortOrder(val.order);
           }
         }
-      })), /* @__PURE__ */ React.createElement("div", {
+      })), /* @__PURE__ */ React.createElement("form", {
         className: "flex flex-wrap gap-4 items-end"
       }, /* @__PURE__ */ React.createElement("div", {
         className: "flex flex-shrink-0 flex-col gap-2 items-start"
@@ -5315,6 +5337,9 @@ const CollectionListPage = () => {
               ...old,
               filterField: val
             }));
+            if (!val) {
+              reFetchCollection();
+            }
           }
         }
       })), showStartsWith && /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", {
@@ -5403,7 +5428,8 @@ const CollectionListPage = () => {
           setPrevCursors([]);
           reFetchCollection();
         },
-        variant: "primary"
+        variant: "primary",
+        type: "submit"
       }, "Search", " ", /* @__PURE__ */ React.createElement(BiSearch, {
         className: "w-5 h-full ml-1.5 opacity-70"
       })), (vars.startsWith || vars.after || vars.before || vars.booleanEquals) && /* @__PURE__ */ React.createElement(Button, {
@@ -5433,7 +5459,7 @@ const CollectionListPage = () => {
         templates: collection.templates
       })))), /* @__PURE__ */ React.createElement(PageBody, null, /* @__PURE__ */ React.createElement("div", {
         className: "w-full mx-auto max-w-screen-xl"
-      }, totalCount > 0 && /* @__PURE__ */ React.createElement("table", {
+      }, documents.length > 0 ? /* @__PURE__ */ React.createElement("table", {
         className: "table-auto shadow bg-white border-b border-gray-200 w-full max-w-full rounded-lg"
       }, /* @__PURE__ */ React.createElement("tbody", {
         className: "divide-y divide-gray-150"
@@ -5531,7 +5557,7 @@ const CollectionListPage = () => {
             }
           ].filter(Boolean)
         })));
-      }))), /* @__PURE__ */ React.createElement("div", {
+      }))) : /* @__PURE__ */ React.createElement(NoDocumentsPlaceholder, null), /* @__PURE__ */ React.createElement("div", {
         className: "pt-4"
       }, /* @__PURE__ */ React.createElement(CursorPaginator, {
         variant: "white",
@@ -5554,6 +5580,13 @@ const CollectionListPage = () => {
     });
   });
 };
+const NoDocumentsPlaceholder = () => {
+  return /* @__PURE__ */ React.createElement("div", {
+    className: "text-center px-5 py-3 flex flex-col items-center justify-center shadow border border-gray-100 bg-gray-50 border-b border-gray-200 w-full max-w-full rounded-lg"
+  }, /* @__PURE__ */ React.createElement("p", {
+    className: "text-base italic font-medium text-gray-300"
+  }, "No documents found."));
+};
 const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
   return /* @__PURE__ */ React.createElement(Modal, null, /* @__PURE__ */ React.createElement(PopupModal, null, /* @__PURE__ */ React.createElement(ModalHeader, {
     close: close2

package/dist/index.js

@@ -2883,7 +2883,8 @@ mutation addPendingDocumentMutation(
       if (branchingEnabled) {
         branchSwitcher = new toolkit.BranchSwitcherPlugin({
           listBranches: handleListBranches,
-          createBranch: handleCreateBranch
+          createBranch: handleCreateBranch,
+          chooseBranch: setCurrentBranch
         });
         cms.plugins.add(branchSwitcher);
       }
@@ -3562,6 +3563,10 @@ mutation addPendingDocumentMutation(
   --tw-border-opacity: 1;
   border-color: rgb(225 221 236 / var(--tw-border-opacity));
 }
+.tina-tailwind .border-gray-100 {
+  --tw-border-opacity: 1;
+  border-color: rgb(237 236 243 / var(--tw-border-opacity));
+}
 .tina-tailwind .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -3656,6 +3661,10 @@ mutation addPendingDocumentMutation(
   padding-left: 12px;
   padding-right: 12px;
 }
+.tina-tailwind .py-3 {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
 .tina-tailwind .py-5 {
   padding-top: 20px;
   padding-bottom: 20px;
@@ -4892,20 +4901,33 @@ This will work when developing locally but NOT when deployed to production.
   const PageWrapper = ({
     children
   }) => {
+    var _a, _b;
+    const cms = toolkit.useCMS();
+    const isLocalMode = (_b = (_a = cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode;
+    const [branchingEnabled, setBranchingEnabled] = React__default["default"].useState(() => cms.flags.get("branch-switcher"));
+    React__default["default"].useEffect(() => {
+      cms.events.subscribe("flag:set", ({ key, value }) => {
+        if (key === "branch-switcher") {
+          setBranchingEnabled(value);
+        }
+      });
+    }, [cms.events]);
     return /* @__PURE__ */ React__default["default"].createElement("div", {
       className: "relative left-0 w-full h-full bg-gradient-to-b from-gray-50/50 to-gray-50 shadow-2xl overflow-y-auto transition-opacity duration-300 ease-out flex flex-col opacity-100"
-    }, children);
+    }, branchingEnabled && !isLocalMode && /* @__PURE__ */ React__default["default"].createElement(toolkit.BranchBanner, null), children);
   };
   const PageHeader = ({
     isLocalMode,
     children
-  }) => /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, isLocalMode && /* @__PURE__ */ React__default["default"].createElement(toolkit.LocalWarning, null), !isLocalMode && /* @__PURE__ */ React__default["default"].createElement(toolkit.BillingWarning, null), /* @__PURE__ */ React__default["default"].createElement("div", {
-    className: "pt-12 px-12"
-  }, /* @__PURE__ */ React__default["default"].createElement("div", {
-    className: "w-full mx-auto max-w-screen-xl"
-  }, /* @__PURE__ */ React__default["default"].createElement("div", {
-    className: "w-full flex justify-between items-end"
-  }, children))));
+  }) => {
+    return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, isLocalMode && /* @__PURE__ */ React__default["default"].createElement(toolkit.LocalWarning, null), !isLocalMode && /* @__PURE__ */ React__default["default"].createElement(toolkit.BillingWarning, null), /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: "pt-12 px-12"
+    }, /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: "w-full mx-auto max-w-screen-xl"
+    }, /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: "w-full flex justify-between items-end"
+    }, children))));
+  };
   const PageBody = ({
     children
   }) => /* @__PURE__ */ React__default["default"].createElement("div", {
@@ -5191,7 +5213,7 @@ This will work when developing locally but NOT when deployed to production.
         }
       }, (collection, _loading, reFetchCollection, collectionExtra) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-        const totalCount = collection.documents.totalCount;
+        collection.documents.totalCount;
         const documents = collection.documents.edges;
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
@@ -5300,7 +5322,7 @@ This will work when developing locally but NOT when deployed to production.
               setSortOrder(val.order);
             }
           }
-        })), /* @__PURE__ */ React__default["default"].createElement("div", {
+        })), /* @__PURE__ */ React__default["default"].createElement("form", {
           className: "flex flex-wrap gap-4 items-end"
         }, /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "flex flex-shrink-0 flex-col gap-2 items-start"
@@ -5331,6 +5353,9 @@ This will work when developing locally but NOT when deployed to production.
                 ...old,
                 filterField: val
               }));
+              if (!val) {
+                reFetchCollection();
+              }
             }
           }
         })), showStartsWith && /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement("div", {
@@ -5419,7 +5444,8 @@ This will work when developing locally but NOT when deployed to production.
             setPrevCursors([]);
             reFetchCollection();
           },
-          variant: "primary"
+          variant: "primary",
+          type: "submit"
         }, "Search", " ", /* @__PURE__ */ React__default["default"].createElement(BiSearch, {
           className: "w-5 h-full ml-1.5 opacity-70"
         })), (vars.startsWith || vars.after || vars.before || vars.booleanEquals) && /* @__PURE__ */ React__default["default"].createElement(toolkit.Button, {
@@ -5449,7 +5475,7 @@ This will work when developing locally but NOT when deployed to production.
           templates: collection.templates
         })))), /* @__PURE__ */ React__default["default"].createElement(PageBody, null, /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "w-full mx-auto max-w-screen-xl"
-        }, totalCount > 0 && /* @__PURE__ */ React__default["default"].createElement("table", {
+        }, documents.length > 0 ? /* @__PURE__ */ React__default["default"].createElement("table", {
           className: "table-auto shadow bg-white border-b border-gray-200 w-full max-w-full rounded-lg"
         }, /* @__PURE__ */ React__default["default"].createElement("tbody", {
           className: "divide-y divide-gray-150"
@@ -5547,7 +5573,7 @@ This will work when developing locally but NOT when deployed to production.
               }
             ].filter(Boolean)
           })));
-        }))), /* @__PURE__ */ React__default["default"].createElement("div", {
+        }))) : /* @__PURE__ */ React__default["default"].createElement(NoDocumentsPlaceholder, null), /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "pt-4"
         }, /* @__PURE__ */ React__default["default"].createElement(toolkit.CursorPaginator, {
           variant: "white",
@@ -5570,6 +5596,13 @@ This will work when developing locally but NOT when deployed to production.
       });
     });
   };
+  const NoDocumentsPlaceholder = () => {
+    return /* @__PURE__ */ React__default["default"].createElement("div", {
+      className: "text-center px-5 py-3 flex flex-col items-center justify-center shadow border border-gray-100 bg-gray-50 border-b border-gray-200 w-full max-w-full rounded-lg"
+    }, /* @__PURE__ */ React__default["default"].createElement("p", {
+      className: "text-base italic font-medium text-gray-300"
+    }, "No documents found."));
+  };
   const DeleteModal = ({ close: close2, deleteFunc, filename }) => {
     return /* @__PURE__ */ React__default["default"].createElement(toolkit.Modal, null, /* @__PURE__ */ React__default["default"].createElement(toolkit.PopupModal, null, /* @__PURE__ */ React__default["default"].createElement(toolkit.ModalHeader, {
       close: close2

package/dist/style.css

@@ -649,6 +649,10 @@
   --tw-border-opacity: 1;
   border-color: rgb(225 221 236 / var(--tw-border-opacity));
 }
+.tina-tailwind .border-gray-100 {
+  --tw-border-opacity: 1;
+  border-color: rgb(237 236 243 / var(--tw-border-opacity));
+}
 .tina-tailwind .bg-white {
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
@@ -743,6 +747,10 @@
   padding-left: 12px;
   padding-right: 12px;
 }
+.tina-tailwind .py-3 {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
 .tina-tailwind .py-5 {
   padding-top: 20px;
   padding-bottom: 20px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -55,9 +55,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "1.3.0",
+    "@tinacms/schema-tools": "1.3.1",
     "@tinacms/sharedctx": "1.0.1",
-    "@tinacms/toolkit": "1.3.2",
+    "@tinacms/toolkit": "1.3.3",
     "crypto-js": "^4.0.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",