@firecms/core 3.0.0-canary.123 → 3.0.0-canary.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.es.js +51 -38
- package/dist/index.es.js.map +1 -1
- package/dist/index.umd.js +51 -38
- package/dist/index.umd.js.map +1 -1
- package/package.json +5 -5
- package/src/app/Scaffold.tsx +3 -4
- package/src/components/EntityCollectionTable/fields/TableReferenceField.tsx +8 -7
- package/src/components/EntityCollectionView/EntityCollectionView.tsx +5 -2
- package/src/components/EntityPreview.tsx +4 -4
- package/src/core/DefaultDrawer.tsx +11 -7
- package/src/core/DrawerNavigationItem.tsx +5 -5
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@firecms/core",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "3.0.0-canary.
|
|
4
|
+
"version": "3.0.0-canary.125",
|
|
5
5
|
"description": "Awesome Firebase/Firestore-based headless open-source CMS",
|
|
6
6
|
"funding": {
|
|
7
7
|
"url": "https://github.com/sponsors/firecmsco"
|
|
@@ -46,9 +46,9 @@
|
|
|
46
46
|
"./package.json": "./package.json"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@firecms/editor": "^3.0.0-canary.
|
|
50
|
-
"@firecms/formex": "^3.0.0-canary.
|
|
51
|
-
"@firecms/ui": "^3.0.0-canary.
|
|
49
|
+
"@firecms/editor": "^3.0.0-canary.125",
|
|
50
|
+
"@firecms/formex": "^3.0.0-canary.125",
|
|
51
|
+
"@firecms/ui": "^3.0.0-canary.125",
|
|
52
52
|
"@hello-pangea/dnd": "^16.6.0",
|
|
53
53
|
"@radix-ui/react-portal": "^1.1.1",
|
|
54
54
|
"clsx": "^2.1.1",
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
"dist",
|
|
101
101
|
"src"
|
|
102
102
|
],
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "501db4cb508b17b75c72c1244cdf88e25f8c1e47",
|
|
104
104
|
"publishConfig": {
|
|
105
105
|
"access": "public"
|
|
106
106
|
},
|
package/src/app/Scaffold.tsx
CHANGED
|
@@ -166,10 +166,9 @@ function DrawerWrapper(props: {
|
|
|
166
166
|
<Tooltip title="Open menu"
|
|
167
167
|
side="right"
|
|
168
168
|
sideOffset={12}
|
|
169
|
-
asChild={true}
|
|
170
|
-
>
|
|
169
|
+
asChild={true}>
|
|
171
170
|
<div
|
|
172
|
-
className="fixed top-2 left-3 !bg-gray-50 dark:!bg-gray-900 rounded-full w-fit z-20">
|
|
171
|
+
className="ml-2 fixed top-2 left-3 !bg-gray-50 dark:!bg-gray-900 rounded-full w-fit z-20">
|
|
173
172
|
<IconButton
|
|
174
173
|
color="inherit"
|
|
175
174
|
aria-label="Open menu"
|
|
@@ -211,7 +210,7 @@ function DrawerWrapper(props: {
|
|
|
211
210
|
aria-label="Open drawer"
|
|
212
211
|
onClick={() => props.setDrawerOpen(true)}
|
|
213
212
|
size="large"
|
|
214
|
-
className="absolute top-2 left-
|
|
213
|
+
className="absolute top-2 left-5"
|
|
215
214
|
>
|
|
216
215
|
<MenuIcon/>
|
|
217
216
|
</IconButton>
|
|
@@ -151,13 +151,14 @@ export const TableReferenceFieldInternal = React.memo(
|
|
|
151
151
|
{internalValue && multiselect && buildMultipleReferenceField()}
|
|
152
152
|
|
|
153
153
|
{valueNotSet &&
|
|
154
|
-
<EntityPreviewContainer
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
154
|
+
<EntityPreviewContainer
|
|
155
|
+
className={cls("px-4 py-2 text-sm font-medium flex items-center uppercase",
|
|
156
|
+
multiselect ? "gap-4" : "gap-6",
|
|
157
|
+
disabled
|
|
158
|
+
? "text-slate-500"
|
|
159
|
+
: "cursor-pointer text-slate-700 dark:text-slate-300 hover:bg-slate-50 dark:hover:bg-gray-800 group-hover:bg-slate-50 dark:group-hover:bg-gray-800")}
|
|
160
|
+
onClick={handleOpen}
|
|
161
|
+
size={"medium"}>
|
|
161
162
|
<IconForView
|
|
162
163
|
size={"small"}
|
|
163
164
|
collectionOrView={collection}
|
|
@@ -45,7 +45,7 @@ import { EntityCollectionViewActions } from "./EntityCollectionViewActions";
|
|
|
45
45
|
import {
|
|
46
46
|
AddIcon,
|
|
47
47
|
Button,
|
|
48
|
-
cls,
|
|
48
|
+
cls, focusedDisabled,
|
|
49
49
|
IconButton,
|
|
50
50
|
KeyboardTabIcon,
|
|
51
51
|
Markdown,
|
|
@@ -785,6 +785,9 @@ function EntityIdHeaderWidget({
|
|
|
785
785
|
<Popover
|
|
786
786
|
open={openPopup}
|
|
787
787
|
onOpenChange={setOpenPopup}
|
|
788
|
+
sideOffset={0}
|
|
789
|
+
align={"start"}
|
|
790
|
+
alignOffset={-117}
|
|
788
791
|
trigger={
|
|
789
792
|
<IconButton size={"small"}>
|
|
790
793
|
<SearchIcon size={"small"}/>
|
|
@@ -814,7 +817,7 @@ function EntityIdHeaderWidget({
|
|
|
814
817
|
setSearchString(e.target.value);
|
|
815
818
|
}}
|
|
816
819
|
value={searchString}
|
|
817
|
-
className={"flex-grow bg-transparent outline-none p-1"}/>
|
|
820
|
+
className={"flex-grow bg-transparent outline-none p-1 " + focusedDisabled}/>
|
|
818
821
|
<Button variant={"outlined"}
|
|
819
822
|
disabled={!(searchString.trim())}
|
|
820
823
|
type={"submit"}
|
|
@@ -77,16 +77,16 @@ export function EntityPreview({
|
|
|
77
77
|
return <EntityPreviewContainer onClick={disabled ? undefined : onClick}
|
|
78
78
|
hover={disabled ? undefined : hover}
|
|
79
79
|
size={size}>
|
|
80
|
-
<div className={cls("w-10 h-10 mr-2 shrink-0
|
|
80
|
+
<div className={cls("flex w-10 h-10 mr-2 shrink-0", size === "smallest" ? "my-0.5" : "m-2 self-start")}>
|
|
81
81
|
{imageProperty && <PropertyPreview property={imageProperty}
|
|
82
82
|
propertyKey={imagePropertyKey as string}
|
|
83
83
|
size={"smallest"}
|
|
84
84
|
value={getValueInPath(entity.values, imagePropertyKey as string)}/>}
|
|
85
|
-
{!imageProperty && <IconForView collectionOrView={collection} size={size} className={"
|
|
85
|
+
{!imageProperty && <IconForView collectionOrView={collection} size={size} className={"m-auto"}/>}
|
|
86
86
|
</div>
|
|
87
87
|
|
|
88
88
|
|
|
89
|
-
<div className={"flex flex-col
|
|
89
|
+
<div className={"flex flex-col grow-1 w-full max-w-full m-1"}>
|
|
90
90
|
|
|
91
91
|
{size !== "smallest" && includeId && (
|
|
92
92
|
entity
|
|
@@ -205,7 +205,7 @@ export const EntityPreviewContainer = React.forwardRef<HTMLDivElement, EntityPre
|
|
|
205
205
|
fullwidth ? "w-full" : "",
|
|
206
206
|
"items-center",
|
|
207
207
|
hover ? "hover:bg-slate-50 dark:hover:bg-gray-800 group-hover:bg-slate-50 dark:group-hover:bg-gray-800" : "",
|
|
208
|
-
size === "smallest" ? "p-1" : "
|
|
208
|
+
size === "smallest" ? "p-1" : "px-2 py-1",
|
|
209
209
|
"flex border rounded-lg",
|
|
210
210
|
onClick ? "cursor-pointer" : "",
|
|
211
211
|
defaultBorderMixin,
|
|
@@ -51,9 +51,9 @@ export function DefaultDrawer({
|
|
|
51
51
|
const groupsWithoutAdmin = groups.filter(g => g !== "Admin");
|
|
52
52
|
|
|
53
53
|
const buildGroupHeader = useCallback((group?: string) => {
|
|
54
|
-
if (!drawerOpen) return <div className="
|
|
54
|
+
if (!drawerOpen) return <div className="w-full"/>;
|
|
55
55
|
return <div
|
|
56
|
-
className="
|
|
56
|
+
className="pl-6 pr-8 py-4 flex flex-row items-center">
|
|
57
57
|
<Typography variant={"caption"}
|
|
58
58
|
color={"secondary"}
|
|
59
59
|
className="font-medium flex-grow line-clamp-1">
|
|
@@ -78,10 +78,14 @@ export function DefaultDrawer({
|
|
|
78
78
|
|
|
79
79
|
<DrawerLogo logo={logo}/>
|
|
80
80
|
|
|
81
|
-
<div className={"flex-grow overflow-scroll no-scrollbar"}
|
|
81
|
+
<div className={"mt-4 flex-grow overflow-scroll no-scrollbar"}
|
|
82
|
+
style={{
|
|
83
|
+
maskImage: "linear-gradient(to bottom, transparent 0, black 20px, black calc(100% - 20px), transparent 100%)",
|
|
84
|
+
}}>
|
|
82
85
|
|
|
83
86
|
{groupsWithoutAdmin.map((group) => (
|
|
84
|
-
<
|
|
87
|
+
<div
|
|
88
|
+
className={"bg-gray-50 dark:bg-gray-800 dark:bg-opacity-30 my-4 rounded-lg ml-4"}
|
|
85
89
|
key={`drawer_group_${group}`}>
|
|
86
90
|
{buildGroupHeader(group)}
|
|
87
91
|
{Object.values(navigationEntries)
|
|
@@ -96,7 +100,7 @@ export function DefaultDrawer({
|
|
|
96
100
|
onClick={() => onClick(view)}
|
|
97
101
|
url={view.url}
|
|
98
102
|
name={view.name}/>)}
|
|
99
|
-
</
|
|
103
|
+
</div>
|
|
100
104
|
))}
|
|
101
105
|
|
|
102
106
|
</div>
|
|
@@ -157,9 +161,9 @@ export function DrawerLogo({ logo }: {
|
|
|
157
161
|
return <div
|
|
158
162
|
style={{
|
|
159
163
|
transition: "padding 100ms cubic-bezier(0.4, 0, 0.6, 1) 0ms",
|
|
160
|
-
padding: drawerOpen ? "32px 144px 0px 24px" : "72px
|
|
164
|
+
padding: drawerOpen ? "32px 144px 0px 24px" : "72px 12px 0px 12px"
|
|
161
165
|
}}
|
|
162
|
-
className={cls("cursor-pointer")}>
|
|
166
|
+
className={cls("cursor-pointer ml-4")}>
|
|
163
167
|
|
|
164
168
|
<Tooltip title={"Home"}
|
|
165
169
|
sideOffset={20}
|
|
@@ -30,17 +30,17 @@ export function DrawerNavigationItem({
|
|
|
30
30
|
<NavLink
|
|
31
31
|
onClick={onClick}
|
|
32
32
|
style={{
|
|
33
|
-
width:
|
|
33
|
+
width: "100%",
|
|
34
34
|
transition: drawerOpen ? "width 150ms ease-in" : undefined
|
|
35
35
|
}}
|
|
36
|
-
className={({ isActive }: any) => cls("rounded-
|
|
37
|
-
"hover:bg-slate-300 hover:bg-opacity-75 dark:hover:bg-
|
|
36
|
+
className={({ isActive }: any) => cls("rounded-lg truncate",
|
|
37
|
+
"hover:bg-slate-300 hover:bg-opacity-75 dark:hover:bg-slate-800 dark:hover:bg-opacity-75 text-gray-800 dark:text-gray-200 hover:text-gray-900 hover:dark:text-white",
|
|
38
38
|
"flex flex-row items-center mr-8",
|
|
39
39
|
// "transition-all ease-in-out delay-100 duration-300",
|
|
40
40
|
// drawerOpen ? "w-full" : "w-18",
|
|
41
|
-
drawerOpen ? "pl-
|
|
41
|
+
drawerOpen ? "pl-4 h-12" : "pl-4 h-11",
|
|
42
42
|
"font-medium text-sm",
|
|
43
|
-
isActive ? "bg-slate-200 bg-opacity-60 dark:bg-gray-800 dark:bg-opacity-
|
|
43
|
+
isActive ? "bg-slate-200 bg-opacity-60 dark:bg-gray-800 dark:bg-opacity-50" : ""
|
|
44
44
|
)}
|
|
45
45
|
to={url}
|
|
46
46
|
>
|