ncore-ui-kit 1.1.0-alpha.0 → 1.1.0-alpha.2

package/lib/typescript/package.json

@@ -1,4 +1,4 @@
 {
   "type": "module",
-  "version": "1.1.0-alpha.0"
+  "version": "1.1.0-alpha.2"
 }

package/lib/typescript/src/components/codeViewer/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/codeViewer/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,gBAAgB,MAAM,QAAQ,CAAC;AAwB3C,QAAA,MAAM,UAAU,GAAI,oBAGjB,gBAAgB,4CAuNlB,CAAC;AACF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/codeViewer/index.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,gBAAgB,MAAM,QAAQ,CAAC;AAwB3C,QAAA,MAAM,UAAU,GAAI,oBAGjB,gBAAgB,4CA0NlB,CAAC;AACF,eAAe,UAAU,CAAC"}

package/lib/typescript/src/components/codeViewer/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../../../src/components/codeViewer/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,KAAK,EACR,MAAM,QAAQ,CAAC;AAmkBhB,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,WAAW,MAAM,KAAG,KAAK,EAsChE,CAAC"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../../../src/components/codeViewer/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAER,KAAK,EACR,MAAM,QAAQ,CAAC;AAimBhB,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,WAAW,MAAM,KAAG,KAAK,EAsChE,CAAC"}

package/lib/typescript/src/components/localeSwitcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/localeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,oBAAoB,MAAM,QAAQ,CAAC;AAiB/C,QAAA,MAAM,cAAc,EAAE,EAAE,CAAC,oBAAoB,CA4I5C,CAAC;AACF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/localeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,oBAAoB,MAAM,QAAQ,CAAC;AAiB/C,QAAA,MAAM,cAAc,EAAE,EAAE,CAAC,oBAAoB,CA8I5C,CAAC;AACF,eAAe,cAAc,CAAC"}

package/lib/typescript/src/components/paletteSwitcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/paletteSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,qBAAqB,MAAM,QAAQ,CAAC;AAkBhD,QAAA,MAAM,eAAe,EAAE,EAAE,CAAC,qBAAqB,CA6J9C,CAAC;AACF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/paletteSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,qBAAqB,MAAM,QAAQ,CAAC;AAkBhD,QAAA,MAAM,eAAe,EAAE,EAAE,CAAC,qBAAqB,CA+J9C,CAAC;AACF,eAAe,eAAe,CAAC"}

package/lib/typescript/src/components/themeSwitcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/themeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,mBAAmB,MAAM,QAAQ,CAAC;AAiB9C,QAAA,MAAM,aAAa,EAAE,EAAE,CAAC,mBAAmB,CAuJ1C,CAAC;AACF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/themeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,mBAAmB,MAAM,QAAQ,CAAC;AAiB9C,QAAA,MAAM,aAAa,EAAE,EAAE,CAAC,mBAAmB,CAyJ1C,CAAC;AACF,eAAe,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ncore-ui-kit",
-    "version": "1.1.0-alpha.0",
+    "version": "1.1.0-alpha.2",
     "description": "NİBGAT® | NCore - UI Kit for React-Native Mobile Apps.",
     "main": "./lib/module/index.js",
     "types": "./lib/typescript/src/index.d.ts",

package/src/components/codeViewer/index.tsx

@@ -55,7 +55,7 @@ const CodeViewer = ({
 
     const timeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-    const containerRef = useRef<import("react").ElementRef<typeof View>>(null);
+    const containerRef = useRef<import("react").ComponentRef<typeof View>>(null);
 
     const [
         stickyTop,
@@ -133,7 +133,10 @@ const CodeViewer = ({
     const handleCopyCode = async () => {
         if (isCopied) return;
 
-        const replacedCode = code.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, "");
+        const replacedCode = tokens
+            .filter(token => token.type !== "comment")
+            .map(token => token.value)
+            .join("");
 
         let isSuccess = false;
 

package/src/components/codeViewer/parser.ts

@@ -555,12 +555,42 @@ const getTokenRegex = (language?: string): RegExp => {
         }
     }
 
-    const keywordsRegexStr = "\\b(?:" + keywordList.join("|") + ")\\b";
+    const keywordsRegexStr = "(?<!\\.)\\b(?:" + keywordList.join("|") + ")\\b";
 
-    const keywordControlRegexStr = "\\b(?:return|if|else|for|while|try|catch|finally|switch|case|break|continue|throw|yield)\\b";
+    const keywordControlRegexStr = "(?<!\\.)\\b(?:return|if|else|for|while|try|catch|finally|switch|case|break|continue|throw|yield)\\b";
 
-    const regexStr = "(?<comment>//.*|/\\*[\\s\\S]*?\\*/|#.*|<!--[\\s\\S]*?-->)|" +
+    let commentRegexStr = "//.*|/\\*[\\s\\S]*?\\*/|#.*|<!--[\\s\\S]*?-->";
+    if (language) {
+        switch (language.toLowerCase()) {
+            case "bash":
+            case "python":
+                commentRegexStr = "#.*";
+                break;
+            case "sql":
+                commentRegexStr = "--.*|/\\*[\\s\\S]*?\\*/";
+                break;
+            case "html":
+            case "xml":
+                commentRegexStr = "<!--[\\s\\S]*?-->";
+                break;
+            case "javascript":
+            case "typescript":
+            case "jsx":
+            case "tsx":
+            case "csharp":
+                commentRegexStr = "//.*|/\\*[\\s\\S]*?\\*/";
+                break;
+        }
+    }
+
+    let bashTextRegexStr = "";
+    if (language && language.toLowerCase() === "bash") {
+        bashTextRegexStr = "(?<text>(?:[a-zA-Z0-9_@]+[.:/-]+)+[a-zA-Z0-9_@]+)|";
+    }
+
+    const regexStr = "(?<comment>" + commentRegexStr + ")|" +
         '(?<string>(["\\\'`])(?:(?=(\\\\?))\\4.)*?\\3)|' +
+        bashTextRegexStr +
         "(?<keywordControl>" + keywordControlRegexStr + ")|" +
         "(?<keyword>" + keywordsRegexStr + ")|" +
         "(?<htmlTag>(?<=<\\/?)[a-z][a-zA-Z0-9-]*\\b)|" +

package/src/components/localeSwitcher/index.tsx

@@ -51,15 +51,17 @@ const LocaleSwitcher: FC<ILocaleSwitcherProps> = ({
         activeLocale
     ]);
 
-    const variantsPre: LocaleSwitchVariants = variantsProps;
+    const variantsPre: Array<Omit<LocaleSwitchVariants[0], "backgroundColor"> & {
+        backgroundColor?: LocaleSwitchVariants[0]["backgroundColor"]
+    }> = variantsProps;
 
     const isHaveNCTRTR = variantsProps.findIndex(iV => iV.localeKey === "tr-TR") !== -1;
     const isHaveNCENUS = variantsProps.findIndex(iV => iV.localeKey === "en-US") !== -1;
 
     if(!isHaveNCTRTR) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             iconColor: "turkish",
             localeKey: "tr-TR",
             icon: ({
@@ -74,8 +76,8 @@ const LocaleSwitcher: FC<ILocaleSwitcherProps> = ({
 
     if(!isHaveNCENUS) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             iconColor: "english",
             localeKey: "en-US",
             icon: ({

package/src/components/paletteSwitcher/index.tsx

@@ -52,7 +52,9 @@ const PaletteSwitcher: FC<IPaletteSwitcherProps> = ({
         activePalette
     ]);
 
-    const variantsPre: ThemeSwitchVariants = variantsProps;
+    const variantsPre: Array<Omit<ThemeSwitchVariants[0], "backgroundColor"> & {
+        backgroundColor?: ThemeSwitchVariants[0]["backgroundColor"]
+    }> = variantsProps;
 
     const isHaveNC = variantsProps.findIndex(iV => iV.paletteKey === "nibgat-community") !== -1;
     const isHaveCC = variantsProps.findIndex(iV => iV.paletteKey === "caycore") !== -1;
@@ -60,8 +62,8 @@ const PaletteSwitcher: FC<IPaletteSwitcherProps> = ({
 
     if(!isHaveN) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             paletteKey: "nibgat",
             iconColor: "moon",
             icon: ({
@@ -76,9 +78,9 @@ const PaletteSwitcher: FC<IPaletteSwitcherProps> = ({
 
     if(!isHaveNC) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             paletteKey: "nibgat-community",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             iconColor: "moon",
             icon: ({
                 size
@@ -92,8 +94,8 @@ const PaletteSwitcher: FC<IPaletteSwitcherProps> = ({
 
     if(!isHaveCC) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             paletteKey: "caycore",
             iconColor: "moon",
             icon: ({

package/src/components/themeSwitcher/index.tsx

@@ -52,15 +52,17 @@ const ThemeSwitcher: FC<IThemeSwitcherProps> = ({
         activeTheme
     ]);
 
-    const variantsPre: ThemeSwitchVariants = variantsProps;
+    const variantsPre: Array<Omit<ThemeSwitchVariants[0], "backgroundColor"> & {
+        backgroundColor?: ThemeSwitchVariants[0]["backgroundColor"]
+    }> = variantsProps;
 
     const isHaveLight = variantsProps.findIndex(iV => iV.themeKey === "light") !== -1;
     const isHaveDark = variantsProps.findIndex(iV => iV.themeKey === "dark") !== -1;
 
     if(!isHaveDark) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             iconColor: "moon",
             themeKey: "dark",
             icon: ({
@@ -80,8 +82,8 @@ const ThemeSwitcher: FC<IThemeSwitcherProps> = ({
 
     if(!isHaveLight) {
         variantsPre.unshift({
+            backgroundColor: isWorkWithHighlightButton ? undefined : "subtle",
             borderColor: "transparent",
-            backgroundColor: "subtle",
             themeKey: "light",
             iconColor: "sun",
             icon: ({