Merge pull request #2 from NativeMindBrowser/dev

Merge: merge dev into main (1.2.0)

Author: tonyhu-012

.github/workflows/release.yml

@@ -18,6 +18,7 @@ jobs:
   release:
     name: Release ${{ inputs.releaseType }}
     runs-on: ubuntu-latest
+    environment: release
     permissions:
       contents: write
       pull-requests: write

CHANGELOG.md

@@ -1,6 +1,122 @@
 # Changelog
 
 
+## v1.2.0-beta.13
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.12...v1.2.0-beta.13)
+
+### 🩹 Fixes
+
+- **translator:** Prevent connection attempt to Ollama when translation is disabled ([9b7943f](https://github.com/NativeMindBrowser/NativeMindExtension/commit/9b7943f))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.12
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.11...v1.2.0-beta.12)
+
+### 🩹 Fixes
+
+- **popup:** Show reload message in popup on unattached tabs ([3e4f0f8](https://github.com/NativeMindBrowser/NativeMindExtension/commit/3e4f0f8))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.11
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.10...v1.2.0-beta.11)
+
+### 🚀 Enhancements
+
+- **context-menu:** Refactor context menu items and update translation menu on tab activation ([d23dea6](https://github.com/NativeMindBrowser/NativeMindExtension/commit/d23dea6))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.10
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.9...v1.2.0-beta.10)
+
+### 🚀 Enhancements
+
+- **chat:** Send button style ([243eae7](https://github.com/NativeMindBrowser/NativeMindExtension/commit/243eae7))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.9
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.8...v1.2.0-beta.9)
+
+### 🩹 Fixes
+
+- Translation context menu ([9eb62a1](https://github.com/NativeMindBrowser/NativeMindExtension/commit/9eb62a1))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.8
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.7...v1.2.0-beta.8)
+
+### 🏡 Chore
+
+- **release:** Add environment specification for release job ([efc7e4d](https://github.com/NativeMindBrowser/NativeMindExtension/commit/efc7e4d))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.7
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.6...v1.2.0-beta.7)
+
+### 🩹 Fixes
+
+- Show settings if ollama not available when using translation ([9d1bcf5](https://github.com/NativeMindBrowser/NativeMindExtension/commit/9d1bcf5))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
+## v1.2.0-beta.6
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.5...v1.2.0-beta.6)
+
+### 🚀 Enhancements
+
+- **docs:** Add links to official website in README ([85dfca3](https://github.com/NativeMindBrowser/NativeMindExtension/commit/85dfca3))
+- **translator:** improve text content formatting in prompts and add skip target selector
+- **translator:** Some pages become unresponsive when using the translation ([7d60f69](https://github.com/NativeMindBrowser/NativeMindExtension/commit/7d60f69))
+
+### 🩹 Fixes
+
+- **readme:** Update demo screenshot ([944ae52](https://github.com/NativeMindBrowser/NativeMindExtension/commit/944ae52))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+- Xukecheng <[email protected]>
+
+## v1.2.0-beta.5
+
+[compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.4...v1.2.0-beta.5)
+
+### 🚀 Enhancements
+
+- **chat:** enhance send button positioning and styling in chat component chore
+- **i18n:** Update extension description for clarity and accuracy ([d49c3bc](https://github.com/NativeMindBrowser/NativeMindExtension/commit/d49c3bc))
+
+### ❤️ Contributors
+
+- Tony Hu ([@tonyhu-012](http://github.com/tonyhu-012))
+
 ## v1.2.0-beta.4
 
 [compare changes](https://github.com/NativeMindBrowser/NativeMindExtension/compare/v1.2.0-beta.3...v1.2.0-beta.4)

README.md

@@ -8,8 +8,9 @@
 
 *Experience powerful AI capabilities with zero cloud dependencies*
 
-<img src="assets/images/demo-screenshot.jpg" alt="NativeMind in Action" width="800">
+<img src="assets/images/demo-screenshot.png" alt="NativeMind in Action" width="800">
 
+### 🚀 [Visit Official Website](https://nativemind.app/)
 
 [![Privacy First](https://img.shields.io/badge/Privacy-First-brightgreen?style=flat-square&logo=security&logoColor=white)]()
 [![No Tracking](https://img.shields.io/badge/Tracking-None-success?style=flat-square&logo=shield&logoColor=white)]()
@@ -45,6 +46,7 @@ Install directly from the [Chrome Web Store](https://chromewebstore.google.com/d
 <div align="center">
 <img src="assets/images/extension-popup.png" alt="NativeMind Extension Interface" width="600">
 <br>
+For more details, visit our official website: **[nativemind.app](https://nativemind.app/)**
 </div>
 
 ## ✨ Core Features

assets/images/demo-screenshot.jpg

@@ -19,6 +19,7 @@ const emit = defineEmits<{
 
 const props = defineProps<{
   modelValue?: string
+  minHeight?: number
 }>()
 
 const textareaRef = ref<HTMLTextAreaElement | null>(null)
@@ -30,11 +31,12 @@ watch(inputValue, async () => {
   await nextTick()
   const textarea = textareaRef.value as HTMLTextAreaElement
   if (!textarea) return
-  textarea.style.height = 'auto' // Reset height to auto to shrink if needed
+  textarea.style.height = '0px' // Reset height to auto to shrink if needed
   // force a reflow to ensure the height is recalculated
   const _ = textarea.offsetHeight
   const scrollHeight = textarea.scrollHeight
-  textarea.style.height = `${scrollHeight}px` // Set height to scrollHeight to expand
+  const height = Math.max(props.minHeight || 0, scrollHeight)
+  textarea.style.height = `${height}px` // Set height to scrollHeight to expand
 })
 
 const onInput = (event: Event) => {

assets/images/demo-screenshot.png

@@ -80,9 +80,9 @@ import IconDelete from '@/assets/icons/delete.svg?component'
 import ModelLogo from '@/components/ModelLogo.vue'
 import { useOllamaStatusStore } from '@/entrypoints/content/store'
 import { deleteOllamaModel } from '@/entrypoints/content/utils/llm'
+import { showSettings } from '@/entrypoints/content/utils/settings'
 import { formatSize } from '@/utils/formatter'
 import { SUPPORTED_MODELS } from '@/utils/llm/web-llm'
-import { getTabStore } from '@/utils/tab-store'
 import { getUserConfig } from '@/utils/user-config'
 import { classNames } from '@/utils/vue/utils'
 
@@ -122,7 +122,6 @@ defineExpose({
 
 const userConfig = await getUserConfig()
 const baseUrl = userConfig.llm.baseUrl.toRef()
-const tabStore = await getTabStore()
 const selectedModel = userConfig.llm.model.toRef()
 const endpointType = userConfig.llm.endpointType.toRef()
 
@@ -142,16 +141,16 @@ const onClickDelete = async (model: string) => {
 
 const onClick = () => {
   if (modelList.value.length === 0) {
-    tabStore.showSetting.value = true
+    showSettings(true, 'model-download-section')
   }
 }
 
 watch(modelList, (modelList) => {
   if (modelList.length === 0) {
-    selectedModel.value = ''
+    selectedModel.value = undefined
     return
   }
-  const newSelectedModel = modelList.find((m) => m.model === selectedModel.value) ?? modelList[0]
+  const newSelectedModel = modelList.find((m) => m.model === selectedModel.value) ?? modelList[0] ?? undefined
   selectedModel.value = newSelectedModel.model
 })
 

components/AutoExpandTextArea.vue

@@ -0,0 +1,48 @@
+<template>
+  <div
+    ref="targetRef"
+    :class="{
+      'outline-2 outline-gray-600 outline-offset-4 outline-dashed rounded-md': highlighting,
+    }"
+  >
+    <slot />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+
+const props = defineProps<{
+  autoScrollIntoView?: boolean
+  scrollIntoViewOptions?: ScrollIntoViewOptions
+  showHighlight?: boolean
+}>()
+
+const targetRef = ref<HTMLDivElement>()
+const highlighting = ref(false)
+
+const scrollIntoView = () => {
+  targetRef.value?.scrollIntoView({
+    behavior: 'smooth',
+    block: 'start',
+    inline: 'start',
+    ...props.scrollIntoViewOptions,
+  })
+}
+
+const highlight = () => {
+  if (!props.showHighlight) return
+  highlighting.value = true
+  setTimeout(() => {
+    highlighting.value = false
+  }, 3000)
+}
+
+onMounted(() => {
+  if (!targetRef.value) return
+  if (props.autoScrollIntoView) {
+    scrollIntoView()
+    highlight()
+  }
+})
+</script>

components/ModelSelector.vue

@@ -2,12 +2,12 @@
   <div
     v-if="toasts.length"
     data-nativemind-toast-group
-    class="fixed left-0 top-0 right-0 flex flex-col items-center gap-2 p-4 z-50"
+    class="fixed left-0 top-0 right-0 flex flex-col items-center gap-2 p-4 z-[calc(infinity-1)]"
   >
     <div
       v-for="toast in toasts"
       :key="toast.id"
-      class="max-w-80 bg-white shadow-md rounded-md p-3 transition-all duration-300 text-xs flex items-center gap-2 justify-between"
+      class="max-w-80 bg-white text-black shadow-md rounded-md p-3 transition-all duration-300 text-xs flex items-center gap-2 justify-between"
     >
       <div class="flex items-center gap-2">
         <div>

components/ScrollTarget.vue

@@ -5,9 +5,10 @@ import { browser } from 'wxt/browser'
 import { defineBackground } from 'wxt/utils/define-background'
 
 import { INVALID_URLS } from '@/utils/constants'
-import { CONTEXT_MENU } from '@/utils/context-menu'
+import { CONTEXT_MENU, CONTEXT_MENU_ITEM_TRANSLATE_PAGE } from '@/utils/context-menu'
 import logger from '@/utils/logger'
 import { bgBroadcastRpc } from '@/utils/rpc'
+import { registerBackgroundRpcEvent } from '@/utils/rpc/background-fns'
 import { isTabValid } from '@/utils/tab'
 import { registerDeclarativeNetRequestRule } from '@/utils/web-request'
 
@@ -50,6 +51,11 @@ export default defineBackground(() => {
   }
 
   browser.tabs.onActivated.addListener(async ({ tabId }) => {
+    // reset the translate context menu to default
+    await browser.contextMenus.update(CONTEXT_MENU_ITEM_TRANSLATE_PAGE.id, {
+      title: CONTEXT_MENU_ITEM_TRANSLATE_PAGE.title,
+      contexts: CONTEXT_MENU_ITEM_TRANSLATE_PAGE.contexts,
+    })
     const tab = await browser.tabs.get(tabId)
     const url = tab.url
     url && (await setPopupStatusBasedOnUrl(tabId, url))
@@ -64,9 +70,8 @@ export default defineBackground(() => {
     })
   })
 
-  browser.tabs.onUpdated.addListener(async (tabId, _changeInfo, tab) => {
-    logger.info('tab updated', { tabId, changeInfo: _changeInfo, tab })
-    unAttachedTabs.delete(tabId)
+  browser.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {
+    logger.info('tab updated', { tabId, changeInfo, tab })
     if (tab.url) {
       await setPopupStatusBasedOnUrl(tabId, tab.url)
     }
@@ -107,5 +112,9 @@ export default defineBackground(() => {
     }
   })
 
+  registerBackgroundRpcEvent('ready', (tabId) => {
+    unAttachedTabs.delete(tabId)
+  })
+
   logger.info('Hello background!', { id: browser.runtime.id })
 })