@manuscripts/body-editor 3.18.1 → 3.18.3

package/src/components/views/TableCellContextMenu.tsx

@@ -17,9 +17,9 @@ import {
   Category,
   DeleteIcon,
   Dialog,
-  IconTextButton,
   PlusIcon,
 } from '@manuscripts/style-guide'
+import { Button } from '@manuscripts/style-guide/mui'
 import { skipTracking } from '@manuscripts/track-changes-plugin'
 import { schema } from '@manuscripts/transform'
 import { Command, EditorState } from 'prosemirror-state'
@@ -125,15 +125,20 @@ export const ContextMenu: React.FC<{
   return (
     <MenuDropdownList className={'table-ctx'}>
       <ActionButton
+        variant="tertiary"
         disabled={isHeaderCellSelected(view.state)}
         onClick={() => runCommand(addRows('top'))}
       >
         <PlusIcon /> Insert {rows} above
       </ActionButton>
-      <ActionButton onClick={() => runCommand(addRows('bottom'))}>
+      <ActionButton
+        variant="tertiary"
+        onClick={() => runCommand(addRows('bottom'))}
+      >
         <PlusIcon /> Insert {rows} below
       </ActionButton>
       <ActionButton
+        variant="tertiary"
         onClick={() =>
           showWarningForTCPlugin(setColumnAction, () => addColumns('left'))
         }
@@ -141,6 +146,7 @@ export const ContextMenu: React.FC<{
         <PlusIcon /> Insert {columns} to the left
       </ActionButton>
       <ActionButton
+        variant="tertiary"
         onClick={() =>
           showWarningForTCPlugin(setColumnAction, () => addColumns('right'))
         }
@@ -149,6 +155,7 @@ export const ContextMenu: React.FC<{
       </ActionButton>
       <Separator />
       <ActionButton
+        variant="tertiary"
         disabled={count.rows !== 1}
         onClick={() => runCommand(addHeaderRow(headerPosition))}
       >
@@ -156,6 +163,7 @@ export const ContextMenu: React.FC<{
       </ActionButton>
       <Separator />
       <ActionButton
+        variant="tertiary"
         onClick={() =>
           showWarningForTCPlugin(setRowDeleteAction, () => deleteRow)
         }
@@ -164,6 +172,7 @@ export const ContextMenu: React.FC<{
         {isHeaderCellSelected(view.state) ? ' header ' : ''} {rows}
       </ActionButton>
       <ActionButton
+        variant="tertiary"
         onClick={() =>
           showWarningForTCPlugin(setColumnAction, () => deleteColumn)
         }
@@ -172,12 +181,18 @@ export const ContextMenu: React.FC<{
       </ActionButton>
       {(isCellSelectionMerged || isCellSelectionSplittable) && <Separator />}
       {isCellSelectionMerged && (
-        <ActionButton onClick={() => runCommand(mergeCells, true)}>
+        <ActionButton
+          variant="tertiary"
+          onClick={() => runCommand(mergeCells, true)}
+        >
           Merge cells
         </ActionButton>
       )}
       {isCellSelectionSplittable && (
-        <ActionButton onClick={() => runCommand(splitCell, true)}>
+        <ActionButton
+          variant="tertiary"
+          onClick={() => runCommand(splitCell, true)}
+        >
           Split cells
         </ActionButton>
       )}
@@ -213,12 +228,11 @@ const MenuDropdownList = styled.div`
   flex-direction: column;
 `
 
-const ActionButton = styled(IconTextButton)`
-  padding: 8px 16px;
-  justify-content: flex-start;
-
-  &:hover {
-    background: #f2fbfc;
+const ActionButton = styled(Button)`
+  && {
+    padding: 8px 16px;
+    justify-content: flex-start;
+    width: 100%;
   }
   &:disabled {
     color: #353535;

package/src/toolbar.tsx

@@ -49,6 +49,7 @@ import {
   blockActive,
   canInsert,
   canInsertCrossReference,
+  canInsertInlineComment,
   Dispatch,
   insertBlock,
   insertBoxElement,
@@ -179,7 +180,9 @@ export const toolbar: ToolbarConfig = {
     comment: {
       title: 'Insert comment',
       content: <AddCommentIcon />,
-      isEnabled: isEnabled(canInsert(schema.nodes.highlight_marker)), // TODO: check both ends of selection
+      isEnabled: isEnabled((state) =>
+        canInsertInlineComment(state.selection.$from)
+      ),
       run: addInlineComment,
     },
     cross_reference: {

package/src/versions.ts

@@ -1,3 +1,3 @@
 //THIS FILE WAS GENERATED BY versions.mjs
-export const VERSION = '3.18.1';
+export const VERSION = '3.18.3';
 export const MATHJAX_VERSION = '3.2.2';

package/src/views/ReactSubView.tsx

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { MuiThemeProvider, muiTheme } from '@manuscripts/style-guide/mui'
 import { ManuscriptEditorView, ManuscriptNode } from '@manuscripts/transform'
 import React from 'react'
 import { flushSync } from 'react-dom'
@@ -92,16 +93,18 @@ function createView<T extends Trackable<ManuscriptNode>>(
     }
 
     return (
-      <ThemeProvider theme={props.theme}>
-        <Component
-          nodeAttrs={node.attrs}
-          setNodeAttrs={setNodeAttrs}
-          viewProps={{ node, view, getPos }}
-          container={container}
-          {...props}
-          {...componentProps}
-        />
-      </ThemeProvider>
+      <MuiThemeProvider theme={muiTheme}>
+        <ThemeProvider theme={props.theme}>
+          <Component
+            nodeAttrs={node.attrs}
+            setNodeAttrs={setNodeAttrs}
+            viewProps={{ node, view, getPos }}
+            container={container}
+            {...props}
+            {...componentProps}
+          />
+        </ThemeProvider>
+      </MuiThemeProvider>
     )
   }
   return Wrapped

package/src/views/cross_reference.ts

@@ -48,7 +48,7 @@ export class CrossReferenceView
     const attrs = this.node.attrs
     const target = attrs.rids.length ? targets.get(attrs.rids[0]) : undefined
 
-    const isSupplement = target?.type === schema.nodes.supplement.name;
+    const isSupplement = target?.type === schema.nodes.supplement.name
     const derivedLabel = isSupplement
       ? target?.caption || target?.label || ''
       : target?.label || ''