@topwrite/reader 1.0.33-alpha.1 → 1.0.33-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@topwrite/reader",
-    "version": "1.0.33-alpha.1+8b627da",
+    "version": "1.0.33-alpha.4+f6042a4",
     "author": "yunwuxin <tzzhangyajun@qq.com> (https://github.com/yunwuxin)",
     "license": "ISC",
     "types": "types/index.d.ts",
@@ -14,11 +14,11 @@
         "build": "webpack --progress",
         "build:dev": "yarn run build --env dev",
         "serve": "webpack serve --env dev",
-        "extract": "formatjs extract src/**/*.ts* --out-file src/lang/zh-CN.json --id-interpolation-pattern [sha512:contenthash:base64:6] --format simple",
+        "extract": "formatjs extract src/**/*.{ts,tsx} --out-file src/lang/zh-CN.json --ignore src/global.d.ts --id-interpolation-pattern [sha512:contenthash:base64:6] --format simple",
         "prepack": "yarn run build"
     },
     "dependencies": {
-        "@topwrite/common": "^1.0.30-alpha.1+8b627da",
+        "@topwrite/common": "^1.0.29",
         "@types/lodash": "^4.14.168",
         "@types/node": "^16.4.13",
         "@types/react": "^17.0.4",
@@ -28,7 +28,7 @@
     },
     "devDependencies": {
         "@babel/runtime": "^7.11.2",
-        "@formatjs/cli": "^4.2.10",
+        "@formatjs/cli": "^5.0.2",
         "@topthink/webpack-config-plugin": "^1.0.0",
         "crypto-browserify": "^3.12.0",
         "path-browserify": "^1.0.1",
@@ -53,5 +53,5 @@
             "optional": true
         }
     },
-    "gitHead": "8b627da233ebf2eac043bb87de8fab2282b54bf6"
+    "gitHead": "f6042a477678301ba49d1b422e0ff915ea9c907f"
 }

package/types/components/article.d.ts

@@ -2,7 +2,6 @@ import Markdown from './markdown';
 import { ComponentProps } from 'react';
 interface ArticleProps extends Omit<ComponentProps<typeof Markdown>, 'children' | 'as'> {
     className?: string;
-    menu?: boolean;
 }
-export default function Article({ className, header, footer, menu, ...props }: ArticleProps): JSX.Element;
+export default function Article({ className, header, footer, ...props }: ArticleProps): JSX.Element;
 export {};

package/types/components/menu.d.ts

@@ -1,7 +1,14 @@
-/// <reference types="react" />
+import { ComponentProps, ReactNode } from 'react';
+import Tooltip from 'rc-tooltip';
 import 'rc-tooltip/assets/bootstrap.css';
-interface MenuProps {
+declare type TooltipProps = ComponentProps<typeof Tooltip>;
+export interface MenuItemProps {
+    tooltip?: TooltipProps['overlay'] | TooltipProps;
+    children: ReactNode;
+    onClick?: () => void;
+}
+export interface MenuProps {
     className?: string;
 }
-export default function Menu({ className }: MenuProps): JSX.Element;
+export default function Menu({ className }: MenuProps): JSX.Element | null;
 export {};

package/types/typings.d.ts

@@ -2,6 +2,7 @@ import { Actions, AnyAction, ComponentDescriptorType, States } from '@topwrite/c
 import * as models from './models';
 import { ComponentProps } from 'react';
 import Markdown from './components/markdown';
+import { MenuItemProps, MenuProps } from './components/menu';
 declare type Models = typeof models;
 declare module '@topwrite/common' {
     function useSelector<T extends keyof Models>(model: T): States<T, Models>[T];
@@ -19,6 +20,8 @@ declare module '@topwrite/common' {
     }
     interface ComponentsMap {
         'page': ComponentDescriptorType;
+        'page:menu': ComponentDescriptorType<MenuProps>;
+        'page:menu:item': ComponentDescriptorType<MenuItemProps>;
         'page:article:before': ComponentDescriptorType;
         'page:article:after': ComponentDescriptorType;
         'page:article:markdown': ComponentDescriptorType<ComponentProps<typeof Markdown>>;