Merge pull request #37 from taroj1205/feat/html-clipboard-support

Author: taroj1205

.changeset/hot-falcons-jump.md

@@ -0,0 +1,5 @@
+---
+"clippr": minor
+---
+
+Add support for HTML and ignore file copies

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - '.changeset/**'
+      - 'CHANGELOG.md'
 
 jobs:
   release:
@@ -117,20 +117,6 @@ jobs:
           Remove-Item -Path "node_modules" -Recurse -Force -ErrorAction SilentlyContinue
         shell: pwsh
 
-      - name: Upload Windows NSIS Installer
-        if: success()
-        uses: actions/upload-artifact@v3
-        with:
-          name: Clippr-nsis
-          path: src-tauri/target/release/bundle/nsis/clippr_${{ steps.version.outputs.APP_VERSION }}_x64-setup.exe
-
-      - name: Upload Windows Executable
-        if: steps.build-app.outcome == 'success'
-        uses: actions/upload-artifact@v3
-        with:
-          name: Clippr-exe
-          path: src-tauri/target/release/Clippr.exe
-
       - name: Create Release
         id: create_release
         if: steps.build-app.outcome == 'success'
@@ -139,7 +125,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ steps.version.outputs.APP_VERSION }}
-          release_name: Release v${{ steps.version.outputs.APP_VERSION }}
+          release_name: Clippr v${{ steps.version.outputs.APP_VERSION }}
           body: ${{ github.event.pull_request.body }}
           draft: true
           prerelease: false

.github/workflows/version-pr.yml

@@ -67,13 +67,7 @@ jobs:
 
             gh pr edit $PR_NUMBER --body "This PR was automatically created by the Version PR workflow to update versions and changelogs.
 
-            ## Changelog Updates
             $CHANGELOG_CONTENT
-
-          ## Checklist
-          - [ ] Review the changelog updates
-          - [ ] Verify version bumps are correct
-          - [ ] Check if any dependencies need manual updates"
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

pnpm-lock.yaml

@@ -1,7 +1,7 @@
 import { createSignal, For, onCleanup, onMount } from "solid-js";
 import { emit, listen } from "@tauri-apps/api/event";
 import { getCurrentWindow } from "@tauri-apps/api/window";
-import { writeImageBase64, writeText } from "tauri-plugin-clipboard-api";
+import { writeHtml, writeImageBase64, writeText } from "tauri-plugin-clipboard-api";
 import { invoke } from "@tauri-apps/api/core";
 import type { ClipboardHistory } from "./types/clipboard";
 import { SearchInput } from "./components/search-input";
@@ -131,11 +131,14 @@ export const App = ({ db_path }: { db_path: string }) => {
     emit("copy-from-app");
     if (item.type === "image") {
       writeImageBase64(item.image);
-    } else {
+    } else if (item.type === "html") {
+      writeHtml(item.content);
+    }
+    else {
       writeText(item.content);
     }
     getCurrentWindow().hide();
-  };
+  }
 
   // const handleDelete = async (item: ClipboardHistory) => {
   //   await invoke<void>("delete_clipboard_from_db", { db_path, id: item.id });

src/App.tsx

@@ -3,6 +3,7 @@ import type { ClipboardHistory } from "../types/clipboard";
 import { cn } from "../utils/tailwind";
 import { DocumentIcon } from "../icons";
 import { ImageIcon } from "../icons/image";
+import { CodeIcon } from "../icons/code";
 import { highlightText } from "../utils/highlight";
 
 interface ClipboardItemProps {
@@ -38,6 +39,16 @@ export const ClipboardItem: Component<ClipboardItemProps> = (props) => {
             class="h-full w-full object-cover overflow-hidden"
           />
         </>
+      ) : props.item.type === "html" ? (
+        <>
+          <CodeIcon class="size-4" />
+          <p class="w-full overflow-hidden text-left text-ellipsis">
+            {highlightText(
+              props.item.content.replace(/<[^>]*>/g, '').trim().split("\n")[0],
+              props.searchQuery
+            )}
+          </p>
+        </>
       ) : (
         <>
           <DocumentIcon class="size-4" />

src/components/clipboard-item.tsx

@@ -40,6 +40,13 @@ export const ClipboardPreview: Component<ClipboardPreviewProps> = (props) => {
             class="w-full object-contain rounded"
           />
         </div>
+      ) : props?.item?.type === "html" ? (
+        <div class="h-full scroll-area w-full max-h-[390px] overflow-auto">
+          <div 
+            class="max-w-none"
+            innerHTML={props.item?.content}
+          />
+        </div>
       ) : (
         <div class="h-full scroll-area w-full max-h-[390px] overflow-auto whitespace-pre-wrap">
           {highlightText(props.item?.content, props.searchQuery)}

src/components/clipboard-preview.tsx

@@ -0,0 +1,21 @@
+import { Component } from "solid-js";
+
+export const CodeIcon: Component<{ class?: string }> = (props) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      class={props.class}
+    >
+      <polyline points="16 18 22 12 16 6" />
+      <polyline points="8 6 2 12 8 18" />
+    </svg>
+  );
+};

src/icons/code.tsx

@@ -5,9 +5,12 @@ import { getCurrentWindow } from "@tauri-apps/api/window";
 import {
   hasImage,
   hasText,
+  hasHTML,
   onClipboardUpdate,
   readText,
   readImageBase64,
+  readHtml,
+  hasFiles,
 } from "tauri-plugin-clipboard-api";
 import "./styles.css";
 import { App } from "./App";
@@ -26,6 +29,8 @@ const main = async () => {
 
   const [hasImageSignal, setHasImageSignal] = createSignal(false);
   const [hasTextSignal, setHasTextSignal] = createSignal(false);
+  const [hasHtmlSignal, setHasHtmlSignal] = createSignal(false);
+  const [hasFileSignal, setHasFileSignal] = createSignal(false);
   const [prevImage, setPrevImage] = createSignal("");
 
   const [isCopyingFromApp, setIsCopyingFromApp] = createSignal(false);
@@ -36,10 +41,16 @@ const main = async () => {
       setIsCopyingFromApp(false);
       return;
     }
+
+    // Skip if clipboard has file
+    if (hasFileSignal()) return;
+
     const windowTitle = (await appWindow.title()) || "unknown";
     const windowExe = "unknown";
     const type = hasImageSignal()
       ? "image"
+      : hasHtmlSignal()
+      ? "html"
       : hasTextSignal()
       ? "text"
       : "unknown";
@@ -66,7 +77,7 @@ const main = async () => {
         image,
       });
     } else {
-      const content = type === "text" ? await readText() : "";
+      const content = type === "html" ? await readHtml() : await readText();
       await invoke("save_clipboard_to_db", {
         db_path,
         content,
@@ -87,6 +98,8 @@ const main = async () => {
       onClipboardUpdate(async () => {
         setHasImageSignal(await hasImage());
         setHasTextSignal(await hasText());
+        setHasHtmlSignal(await hasHTML());
+        setHasFileSignal(await hasFiles());
 
         await saveClipboard();
         emit("clipboard_saved");

src/index.tsx

@@ -17,5 +17,9 @@ export default {
       },
     },
   },
-  plugins: [scrollbarGutter(), scrollbarWidth(), scrollbarColor()],
+  plugins: [
+    scrollbarGutter(), 
+    scrollbarWidth(), 
+    scrollbarColor(),
+  ],
 };