@alpaca-editor/core 1.0.3845 → 1.0.3847

package/src/editor/menubar/SecondaryControls.tsx

@@ -0,0 +1,46 @@
+import { useEditContext } from "../client/editContext";
+import { ItemLanguageVersion } from "./ItemLanguageVersion";
+import { ActiveUsers } from "./ActiveUsers";
+import { ActionsMenu } from "./ActionsMenu";
+import { Separator } from "../menubar/Separator";
+import { ArrowRightIcon } from "../ui/Icons";
+export function SecondaryControls() {
+  const editContext = useEditContext();
+
+  if (editContext?.isMobile) {
+    return (
+      <div className="flex flex-col items-end gap-4">
+        <div className="flex flex-col gap-2">
+          <Headline title="Current Page" />
+          <ItemLanguageVersion />
+        </div>
+        <div className="flex flex-col gap-2">
+          <Headline title="Active Users" />
+          <ActiveUsers />
+        </div>
+        <div className="flex flex-col gap-2">
+          <Headline title="Actions" />
+          <ActionsMenu isMobile={true} />
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex items-center gap-2">
+      <ItemLanguageVersion />
+      <Separator size="large" />
+      <ActiveUsers />
+      <Separator size="large" />
+      <ActionsMenu isMobile={false} />
+    </div>
+  );
+}
+
+function Headline({ title }: { title: string }) {
+  return (
+    <div className="flex flex-col items-end gap-2">
+      <div className="text-sm font-bold text-gray-300">{title}</div>
+    </div>
+  );
+}

package/src/editor/page-viewer/MiniMap.tsx

@@ -291,7 +291,7 @@ export function MiniMap({
 
   return (
     <div
-      className="relative z-50 overflow-hidden bg-white"
+      className="relative overflow-hidden bg-white"
       ref={minimapContainerRef}
       style={{
         height: "100%",

package/src/editor/page-viewer/PageViewer.tsx

@@ -128,10 +128,15 @@ export function PageViewer({
     />,
   );
 
+  if (editContext?.isMobile) {
+    panels.reverse();
+  }
+
   return (
     <Allotment
       proportionalLayout={false}
       ref={allotmentRef}
+      vertical={editContext?.isMobile}
       onChange={(newSizes) => {
         if (!newSizes || newSizes.length === 0) return;
         if (showFormEditor && newSizes[0]) {

package/src/editor/reviews/Comment.tsx

@@ -70,6 +70,24 @@ export function Comment({ comment }: { comment: CommentType }) {
 
   const canResolve = !comment.isNew && !editContext?.readonly;
 
+  const getHiddenSystemPrompt = (comment: CommentType) => {
+    let prompt =
+      "Please make suggestions how to resolve a review comment. Ask the user whether you should apply the suggested changes.";
+    if (comment.itemId) {
+      prompt += "\n\nItemId: " + comment.itemId;
+    }
+    if (comment.itemName) {
+      prompt += "\n\nItem name: " + comment.itemName;
+    }
+    if (comment.itemId) {
+      prompt += "\n\nItemId: " + comment.itemId;
+    }
+    if (comment.fieldName) {
+      prompt += "\n\nField name: " + comment.fieldName;
+    }
+    return prompt;
+  };
+
   const renderHeader = () => {
     const overlayPanelRef = useRef<OverlayPanel>(null);
     const deleteOverlayPanelRef = useRef<OverlayPanel>(null);
@@ -160,14 +178,12 @@ export function Comment({ comment }: { comment: CommentType }) {
                 icon="pi pi-sparkles"
                 label="AI"
                 onClick={async (event) => {
-                  console.log("showing ai popup", comment.text);
                   editContext?.showAiPopup(event as any, {
                     initialPrompt:
                       'Please help me resolve this comment: "' +
                       comment.text +
                       '"',
-                    hiddenSystemPrompt:
-                      "Please make suggestions how to resolve a review comment. Ask the user whether you should apply the suggested changes.",
+                    hiddenSystemPrompt: getHiddenSystemPrompt(comment),
                   });
                 }}
               />

package/src/editor/reviews/reviewCommands.tsx

@@ -4,7 +4,7 @@ import { approveReview, rejectReview } from "../services/reviewsService";
 export const approveReviewCommand: Command<CommandData> = {
   id: "approveReview",
   label: "Approve Page",
-  icon: <i className="pi pi-check text-green-500 mr-3" />,
+  icon: <i className="pi pi-check text-green-500" />,
   execute: async (context: CommandContext<CommandData>) => {
     if (!context.editContext.currentItemDescriptor) {
       return;
@@ -22,7 +22,7 @@ export const approveReviewCommand: Command<CommandData> = {
 export const rejectReviewCommand: Command<CommandData> = {
   id: "rejectReview",
   label: "Reject Page",
-  icon: <i className="pi pi-times text-red-500 mr-3" />,
+  icon: <i className="pi pi-times text-red-500" />,
   execute: async (context: CommandContext<CommandData>) => {
     if (!context.editContext.currentItemDescriptor) {
       return;
@@ -41,7 +41,7 @@ export const rejectReviewCommand: Command<CommandData> = {
 function isReviewer(context: CommandContext<CommandData>) {
   return (
     context.editContext.reviews.reviews.find(
-      (x) => x.reviewerEmail === context.editContext.user?.email
+      (x) => x.reviewerEmail === context.editContext.user?.email,
     ) !== undefined
   );
 }

package/src/editor/sidebar/ViewSelector.tsx

@@ -1,6 +1,7 @@
 import { classNames } from "primereact/utils";
 
 import { useEditContext } from "../client/editContext";
+import { cn } from "../../lib/utils";
 
 export function ViewSelector() {
   const editContext = useEditContext();
@@ -9,7 +10,12 @@ export function ViewSelector() {
     editContext?.configuration.editor.views.filter((x) => !x.hidden) ?? [];
 
   return (
-    <div className="z-10 flex max-w-11 flex-col items-center gap-4 bg-gray-100 p-2 shadow-md">
+    <div
+      className={cn(
+        "z-10 flex items-center gap-4 bg-gray-100 p-2 shadow-md",
+        editContext?.isMobile ? "flex-row justify-around" : "max-w-11 flex-col",
+      )}
+    >
       {views
         .filter((x) => x.icon)
         .map((x, i) => (

package/src/editor/ui/SimpleTable.tsx

@@ -26,7 +26,7 @@ export function SimpleTable<T>({
       <thead className="border-b border-neutral-200 font-medium">
         <tr>
           {columns.map((col, index) => (
-            <th key={index} className="px-2 py-3">
+            <th key={index} className="px-1.5 py-1.5">
               {col.header}
             </th>
           ))}

package/src/editor/views/SingleEditView.tsx

@@ -35,7 +35,9 @@ export function SingleEditView({
   return (
     <PageViewer
       pageViewContext={pageViewContext}
-      showFormEditor={true}
+      showFormEditor={
+        editContext?.viewName == "page-editor" || !editContext?.isMobile
+      }
       compareView={compareView}
       name={name}
       followEditsDefault={true}

package/src/revision.ts

@@ -1,2 +1,2 @@
-export const version = "1.0.3845";
-export const buildDate = "2025-04-25 14:06:12";
+export const version = "1.0.3847";
+export const buildDate = "2025-04-26 11:32:40";