circle-ihk - npm Package Compare versions

Comparing version 1.0.8 to 1.0.9

dist/hook/useOption.d.ts

@@ -6,2 +6,3 @@ /// <reference types="react" />
     disabled?: boolean;
+    fieldToListen?: string;
 }
@@ -8,0 +9,0 @@ export default function useOption(props: IProps): {

dist/hook/useOption.js

@@ -5,3 +5,3 @@ import useApp from './useApp';
 export default function useOption(props) {
-    const { id, disabled, defaultValue } = props;
+    const { id, disabled, defaultValue, fieldToListen } = props;
     const { app, me, container } = useApp();
@@ -44,11 +44,19 @@ const [value, setValue] = useState(defaultValue);
         refetch();
-        let fieldToListen = `${id}_option`;
-        if (!id || id === 'option') {
-            fieldToListen = `${me.id}_option`;
+        let fieldToListenValue = '';
+        if (fieldToListen) {
+            fieldToListenValue = fieldToListen;
         }
-        else if (id === 'display') {
-            fieldToListen = `${me.id}_display_${app.colorScheme.value ? app.colorScheme.value + '_' : ''}option`;
+        else {
+            if (!id || id === 'option') {
+                fieldToListenValue = `${me.id}_option`;
+            }
+            else if (id === 'display') {
+                fieldToListenValue = `${me.id}_display_${app.colorScheme.value ? app.colorScheme.value + '_' : ''}option`;
+            }
+            else {
+                fieldToListenValue = `${id}_option`;
+            }
         }
         const hooks = [];
-        hooks.push(app.on(fieldToListen, refetch));
+        hooks.push(app.on(fieldToListenValue, refetch));
         hooks.push(app.on('color_scheme', refetch));
@@ -55,0 +63,0 @@ return () => {

dist/utils/page-info.d.ts

 import { App } from '../interface';
-export default function pageInfo(app: App): {
-    url: any;
-    domain: any;
-    lang: any;
-    title: any;
+export default function pageInfo(app: App, exportFromDOMOrString?: string | HTMLElement): {
+    url: string;
+    content: HTMLElement;
+    domain: string;
+    title: string | undefined;
+    lang: string;
 };

dist/utils/page-info.js

 import url from './url';
-import { isElement } from './is';
 import nodeText from './node-text';
-export default function pageInfo(app) {
-    const data = app.field('node');
-    if (Array.isArray(data) && data.length > 0) {
-        const item = data[0];
-        return {
-            url: item.url,
-            domain: item.domain,
-            lang: item.lang || 'zh-Hans',
-            title: isElement(item.title) ? nodeText(item.title) : item.title,
-        };
-    }
-    return {
+import { isElement, isString } from './is';
+export default function pageInfo(app, exportFromDOMOrString) {
+    const returnValue = {
         url: url(),
+        content: document.body,
         domain: location.hostname,
@@ -21,2 +12,45 @@ title: document.title.split(' - ').shift(),
     };
+    const data = app.field('node');
+    if (Array.isArray(data) && data.length > 0) {
+        const item = data[0];
+        if (item.url) {
+            returnValue.url = item.url;
+        }
+        if (item.domain) {
+            returnValue.domain = item.domain;
+        }
+        if (item.lang) {
+            returnValue.lang = item.lang;
+        }
+        if (item.url) {
+            returnValue.url = item.url;
+        }
+        if (item.title) {
+            returnValue.title = isElement(item.title)
+                ? nodeText(item.title)
+                : item.title;
+        }
+    }
+    const container = app.field('container');
+    if (isElement(container)) {
+        returnValue.content = container;
+        const title = container.querySelector('.page .title');
+        if (isElement(title)) {
+            returnValue.title = nodeText(title);
+        }
+    }
+    if (exportFromDOMOrString) {
+        // @ts-ignore
+        if (isString(exportFromDOMOrString) && exportFromDOMOrString.length > 0) {
+            const tmp = document.createElement('div');
+            // @ts-ignore
+            tmp.innerHTML = exportFromDOMOrString;
+            returnValue.content = tmp;
+        }
+        else if (isElement(exportFromDOMOrString)) {
+            // @ts-ignore
+            returnValue.content = exportFromDOMOrString;
+        }
+    }
+    return returnValue;
 }

package.json

 {
   "name": "circle-ihk",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "license": "MIT",
@@ -5,0 +5,0 @@ "description": "Circle Reader Component Library",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

49722

increased by3.07%

Lines of code

1448

increased by3.13%

No dependency changes