@social-mail/social-mail-client 1.8.329 → 1.8.330

package/src/common/pages/files/service/CloudFileService.ts

@@ -30,13 +30,16 @@ export default class CloudFileService {
     @Inject
     private localFileService: LocalFileService;
 
-    async topSites({ search = void 0} = {}) {
+    async topSites({ search = void 0, isDesign = false} = {}) {
         const userID = SocialMailApp.user.userID;
         let q = this.entityService.query(WebSite);
         if (search) {
             search = "%" + search + "%";
             q = q.where({ search }, (p) => (x) => Sql.text.iLike(x.folder.name, p.search));
         }
+        q = isDesign
+            ? q.where((x) => x.isDesign === true)
+            : q.where((x) => x.isDesign === false);
         const top = await (search
                 ? q
                 : q.orderByDescending({userID} , (p) => (x) => x.folder.userPins.some((s) => p.userID === s.userID)))

package/src/common/pages/websites/list/WebSiteListPage.tsx

@@ -35,6 +35,9 @@ export default class WebSiteListPage extends MasterDetailPage {
 
     async init() {
 
+        this.showDesigns = /design/i.test(this.parameters.type);
+        this.showTemplates = /template/i.test(this.parameters.type);
+
         this.headerRenderer = () => <div data-layout="header-row">
             <input
                 type="search"
@@ -81,8 +84,9 @@ export default class WebSiteListPage extends MasterDetailPage {
 
     @Action({ onEvent: "create-new-website"})
     async createNewWebsite() {
-        await PageNavigator.pushPageForResult(WebSiteEditor);
-        await this.init();
+        const model = await PageNavigator.pushPageForResult(WebSiteEditor);
+        this.selectedItem = model;
+        this.version++;
     }
 
     @Action({ onEvent: "selection-updated"})

package/src/site-editor/editor/ui/SelectionUI.tsx

@@ -43,6 +43,22 @@ const setCapture = (editor: HtmlPageEditor, element: HTMLElement, e: PointerEven
     const selectedElement = selection.element;
     const selectedParent = selectedElement.parentElement;
 
+
+    const insetAttribute = `${prefix}-inset`;
+    const widthAttribute = `${prefix}-width`;
+    const heightAttribute = `${prefix}-height`;
+
+    const oldWidth = selectedElement.getAttribute(widthAttribute);
+    const oldHeight = selectedElement.getAttribute(heightAttribute);
+    const oldInset = selectedElement.getAttribute(insetAttribute);
+
+    let newInset;
+    let newHeight;
+    let newWidth;
+
+    const records = [] as MutationRecord[];
+
+
     const style = selectedElement.ownerDocument.defaultView.getComputedStyle(selectedElement);
     const { left = "0", top = "0", right = "0", bottom = "0" } = style;
     const width = selectedParent.offsetWidth;
@@ -50,7 +66,9 @@ const setCapture = (editor: HtmlPageEditor, element: HTMLElement, e: PointerEven
 
     const ps = (v, max) => (v* 100 / (max || 1)).toFixed(2);
 
-    const d = editor.undoRedo.beginPause();
+    const { undoRedo } = editor;
+
+    const d = undoRedo.beginPause();
 
     const captureMove = (evt: PointerEvent) => {
         const dx = evt.clientX - sx;
@@ -66,8 +84,8 @@ const setCapture = (editor: HtmlPageEditor, element: HTMLElement, e: PointerEven
             dy
         };
         const r = fx(ri);
-        const av = `${ps(r.top, height)}% ${ps(r.right, width)}% ${ps(r.bottom, height)}% ${ps(r.left, width)}%`;
-        selectedElement.setAttribute(`${prefix}-inset`, av);
+        newInset = `${ps(r.top, height)}% ${ps(r.right, width)}% ${ps(r.bottom, height)}% ${ps(r.left, width)}%`;
+        selectedElement.setAttribute(insetAttribute, newInset);
         // if (/^img$/i.test(selectedElement.tagName)) {
             // image needs width/height as well...
             if (!r.move) {
@@ -79,8 +97,10 @@ const setCapture = (editor: HtmlPageEditor, element: HTMLElement, e: PointerEven
                 if (ri.right === r.right) {
                     widthDiff -= r.right;
                 }
-                selectedElement.setAttribute(`${prefix}-width`, ps(width + widthDiff, width) + "%");
-                selectedElement.setAttribute(`${prefix}-height`, ps(height + heightDiff, height) + "%");
+                newWidth = ps(width + widthDiff, width) + "%";
+                selectedElement.setAttribute(widthAttribute, newWidth);
+                newHeight = ps(height + heightDiff, height) + "%";
+                selectedElement.setAttribute(heightAttribute, newHeight);
             }
         // }
 
@@ -97,8 +117,38 @@ const setCapture = (editor: HtmlPageEditor, element: HTMLElement, e: PointerEven
         element.removeEventListener("pointermove", captureMove);
         element.removeEventListener("pointerup", release);
         captureMove(e1);
-        d.resume();
         editor.commit();
+        d.resume();
+
+        // push records...
+        records.push({
+            type: "attributes",
+            oldValue: oldInset,
+            target: selectedElement as any,
+            attributeName: insetAttribute,
+            attributeNamespace: "",
+        } as MutationRecord);
+
+        if (newWidth) {
+            records.push({
+                type: "attributes",
+                oldValue: oldWidth,
+                target: selectedElement as any,
+                attributeName: widthAttribute,
+                attributeNamespace: "",
+            } as MutationRecord);
+        }
+        if (newHeight) {
+            records.push({
+                type: "attributes",
+                oldValue: oldHeight,
+                target: selectedElement as any,
+                attributeName: heightAttribute,
+                attributeNamespace: "",
+            } as MutationRecord);
+        }
+
+        undoRedo.observe(records);
     };
     element.addEventListener("pointerup", release);
 };

package/src/style/GlobalStyle.ts

@@ -29,7 +29,7 @@ function addLinkTag(href, integrity?, rel = "stylesheet") {
 }
 
 addLinkTag("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&display=swap");
-addLinkTag("https://dtzkc6yot8xw8.cloudfront.net/npm/package/@c8private/fa-icons@6.7.2/css/all.min.css");
+addLinkTag("https://dtzkc6yot8xw8.cloudfront.net/npm/package/@c8private/fa-icons@7.0.0/css/all.min.css");
 addLinkTag("https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0");
 addLinkTag("https://cdn.jsdelivr.net/npm/file-icon-vectors@1.0.0/dist/file-icon-vivid.min.css");
 

package/src/web/drawer/AppDrawer.tsx

@@ -132,6 +132,26 @@ export default class AppDrawer extends BaseDrawer {
                         label="All"
                         commandLink={AppCommands.openWebSiteList.displayRoute({})}
                     />
+                </ExpanderMenu>
+                                <ExpanderMenu
+                    style-display={Bind.oneWay(() => this.menuService.designs.length > 0)}
+                    isExpanded={true}>
+                    <MenuItem
+                        icon="fa-duotone fa-thin fa-object-group"
+                        label="Designs"
+                        commandLink={null}
+                        />
+                    <MenuRepeater
+                        items={this.menuService.websites}
+                        itemRenderer={(d: IWebSite) => <MenuItem
+                            commandLink={CommonCommands.openWebSiteDetails.displayRoute({ id: d.folderID })}
+                            label={d.folder.name}
+                            description={toFileSize(Number(d.folder.fileSize) + Number(d.snapshotStorage))}
+                            />}/>
+                    <MenuItem
+                        label="All"
+                        commandLink={AppCommands.openWebSiteDesignList.displayRoute({})}
+                    />
                 </ExpanderMenu>
                 <ExpanderMenu isExpanded={false}>
                     <MenuItem