ag-common 0.0.426 → 0.0.428

package/dist/common/helpers/string/contains.d.ts

@@ -18,3 +18,19 @@ export declare function containsInsensitiveIndex({ str, fromLast, }: {
  * @returns
  */
 export declare const containsInsensitive: (str: string, ...args: string[]) => boolean;
+/**
+ * returns list of found indexes
+ * @param str
+ * @param args
+ * @returns
+ */
+export declare function containsInsensitiveIndexes({ haystack, needle, fromLast, maxFound, }: {
+    /**
+     * if true, will return highest number. default false
+     */
+    fromLast?: boolean;
+    haystack: string;
+    needle: string;
+    /** if provided will stop after maxfound */
+    maxFound?: number;
+}): number[];

package/dist/common/helpers/string/contains.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containsInsensitive = exports.containsInsensitiveIndex = void 0;
+exports.containsInsensitiveIndexes = exports.containsInsensitive = exports.containsInsensitiveIndex = void 0;
 /**
  * returns >-1 if found
  * @param str
@@ -31,3 +31,32 @@ exports.containsInsensitiveIndex = containsInsensitiveIndex;
  */
 const containsInsensitive = (str, ...args) => containsInsensitiveIndex({ str }, ...args) !== -1;
 exports.containsInsensitive = containsInsensitive;
+/**
+ * returns list of found indexes
+ * @param str
+ * @param args
+ * @returns
+ */
+function containsInsensitiveIndexes({ haystack, needle, fromLast = false, maxFound = 10, }) {
+    if (!haystack || !needle) {
+        return [-1];
+    }
+    const lstr = haystack.toLowerCase();
+    const indexes = [];
+    let lastIndex;
+    while (lastIndex !== -1) {
+        if (indexes.length >= maxFound) {
+            break;
+        }
+        lastIndex = fromLast
+            ? lstr.lastIndexOf(needle, lastIndex)
+            : lstr.indexOf(needle, lastIndex);
+        if (lastIndex === -1) {
+            break;
+        }
+        indexes.push(lastIndex);
+        lastIndex += 1;
+    }
+    return indexes;
+}
+exports.containsInsensitiveIndexes = containsInsensitiveIndexes;

package/dist/common/helpers/string/getExtendedStringSegment.d.ts

@@ -16,4 +16,13 @@ export interface IGetExtendedStringSegment {
  * @param needle
  * @returns
  */
-export declare const getExtendedStringSegment: (hay: string, needle: string, blocksOnEitherSide?: number, gapChars?: string[]) => undefined | IGetExtendedStringSegment;
+export declare const getExtendedStringSegments: (p: {
+    /** all text */
+    hay: string;
+    /** search term */
+    needle: string;
+    /** add this much content on either side of found item. default 5 */
+    blocksOnEitherSide?: number;
+    /** can override this if space bounded words are required. default newline */
+    gapChars?: string[];
+}) => undefined | IGetExtendedStringSegment[];

package/dist/common/helpers/string/getExtendedStringSegment.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtendedStringSegment = void 0;
+exports.getExtendedStringSegments = void 0;
 const contains_1 = require("./contains");
 /**
  * will return a piece of text around a found term, and the index it was found
@@ -8,37 +8,41 @@ const contains_1 = require("./contains");
  * @param needle
  * @returns
  */
-const getExtendedStringSegment = (hay, needle, blocksOnEitherSide = 5, 
-/** can override this if space bounded words are required */
-gapChars = ['\n', '\r\n']) => {
-    const fi = (0, contains_1.containsInsensitiveIndex)({ str: hay }, needle);
-    if (fi === -1) {
-        return undefined;
-    }
-    let start = fi;
-    //we want to extend the partial content back to -(gap) gapChars
-    for (let a = 0; a <= blocksOnEitherSide; a += 1) {
-        const newstartI = (0, contains_1.containsInsensitiveIndex)({ str: hay.substring(0, start), fromLast: true }, ...gapChars);
-        if (newstartI !== -1) {
-            start = newstartI;
+const getExtendedStringSegments = (p) => {
+    const { blocksOnEitherSide = 5, gapChars = ['\n', '\r\n'], hay, needle } = p;
+    const fis = (0, contains_1.containsInsensitiveIndexes)({ haystack: hay, needle });
+    const founds = [];
+    fis.forEach((fi) => {
+        if (fi === -1) {
+            return;
         }
-    }
-    //and forward
-    let end = fi + needle.length;
-    for (let a = 0; a <= blocksOnEitherSide; a += 1) {
-        const newEndI = (0, contains_1.containsInsensitiveIndex)({ str: hay.substring(end) }, ...gapChars);
-        if (newEndI !== -1) {
-            end += newEndI + 1;
+        let start = fi;
+        //we want to extend the partial content back to -(gap) gapChars
+        for (let a = 0; a <= blocksOnEitherSide; a += 1) {
+            const newstartI = (0, contains_1.containsInsensitiveIndex)({ str: hay.substring(0, start), fromLast: true }, ...gapChars);
+            if (newstartI !== -1) {
+                start = newstartI;
+            }
         }
-    }
-    const outerText = hay.substring(start, end);
-    const innerStart = outerText.toLowerCase().indexOf(needle.toLowerCase());
-    return {
-        outerStart: start,
-        outerEnd: end,
-        outerText,
-        innerStart,
-        innerEnd: innerStart + needle.length,
-    };
+        //and forward
+        let end = fi + needle.length;
+        for (let a = 0; a <= blocksOnEitherSide; a += 1) {
+            const newEndI = (0, contains_1.containsInsensitiveIndex)({ str: hay.substring(end) }, ...gapChars);
+            if (newEndI !== -1) {
+                end += newEndI + 1;
+            }
+        }
+        const outerText = hay.substring(start, end);
+        const innerStart = outerText.toLowerCase().indexOf(needle.toLowerCase());
+        const found = {
+            outerStart: start,
+            outerEnd: end,
+            outerText,
+            innerStart,
+            innerEnd: innerStart + needle.length,
+        };
+        founds.push(found);
+    });
+    return founds;
 };
-exports.getExtendedStringSegment = getExtendedStringSegment;
+exports.getExtendedStringSegments = getExtendedStringSegments;

package/dist/ui/components/Search/Base.js

@@ -67,13 +67,13 @@ const SearchBase = (p) => {
     var _a, _b, _c, _d;
     const { maxDisplayItems = 20 } = p;
     const [searchText, setSearchText] = (0, react_1.useState)((_a = p.defaultValue) !== null && _a !== void 0 ? _a : '');
-    const resWrap = (foundItem) => {
+    const resWrap = (foundItem, target) => {
         var _a, _b;
         if (!foundItem) {
             (_a = p.onSelectItem) === null || _a === void 0 ? void 0 : _a.call(p, undefined);
         }
         else {
-            (_b = p.onSelectItem) === null || _b === void 0 ? void 0 : _b.call(p, { foundItem, searchText });
+            (_b = p.onSelectItem) === null || _b === void 0 ? void 0 : _b.call(p, { foundItem, searchText, target });
         }
     };
     const filteredItemsRaw = p.displayItems.filter((i) => p.willDisplayItem(searchText, i));
@@ -83,7 +83,7 @@ const SearchBase = (p) => {
     return (react_1.default.createElement(Base, { className: p.className },
         react_1.default.createElement(SearchBox_1.SearchBox, Object.assign({}, p, { searchText: searchText, setSearchText: setSearchText })),
         react_1.default.createElement(Content, { "data-hasitems": !!filteredItems.length, "data-type": "content" },
-            filteredItems.map((item, index) => (react_1.default.createElement(Row, { key: p.getKeyF(item), onClick: () => resWrap(item) }, p.renderItem({ searchText, item, index })))),
+            filteredItems.map((item, index) => (react_1.default.createElement(Row, { key: p.getKeyF(item), onClick: (e) => resWrap(item, e.target) }, p.renderItem({ searchText, item, index })))),
             searchText && react_1.default.createElement(Row, null, showText))));
 };
 exports.SearchBase = SearchBase;

package/dist/ui/components/Search/types.d.ts

@@ -35,6 +35,7 @@ export interface ISearchDialog<T> {
 export type TSearchModalRes<T> = undefined | {
     foundItem: T;
     searchText: string;
+    target: EventTarget;
 };
 export type ISearchModal<T> = ISearchDialog<T>;
 export type ISearchInline<T> = ISearchDialog<T>;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.426",
+  "version": "0.0.428",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -29,8 +29,8 @@
   },
   "devDependencies": {
     "@babel/core": "7.21.4",
-    "@babel/preset-typescript": "^7.21.4",
-    "@babel/types": "^7.21.4",
+    "@babel/preset-typescript": "^7.21.5",
+    "@babel/types": "^7.21.5",
     "@emotion/react": "11.10.6",
     "@emotion/styled": "11.10.6",
     "@storybook/addon-actions": "7.0.7",