Merge pull request #421 from DishpitDev/staging

v0.7.2
DishpitDev · Jan 12, 2025 · 90ab4d4 · 90ab4d4
2 parents 71871fa + 9b0dc5f
commit 90ab4d4
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 10 deletions.
diff --git a/Slopify/src-tauri/icons/128x128.png b/Slopify/src-tauri/icons/128x128.png
diff --git a/Slopify/src-tauri/icons/[email protected] b/Slopify/src-tauri/icons/[email protected]
diff --git a/Slopify/src-tauri/icons/32x32.png b/Slopify/src-tauri/icons/32x32.png
diff --git a/Slopify/src-tauri/icons/Square107x107Logo.png b/Slopify/src-tauri/icons/Square107x107Logo.png
diff --git a/Slopify/src-tauri/icons/Square142x142Logo.png b/Slopify/src-tauri/icons/Square142x142Logo.png
diff --git a/Slopify/src-tauri/icons/Square150x150Logo.png b/Slopify/src-tauri/icons/Square150x150Logo.png
diff --git a/Slopify/src-tauri/icons/Square284x284Logo.png b/Slopify/src-tauri/icons/Square284x284Logo.png
diff --git a/Slopify/src-tauri/icons/Square30x30Logo.png b/Slopify/src-tauri/icons/Square30x30Logo.png
diff --git a/Slopify/src-tauri/icons/Square310x310Logo.png b/Slopify/src-tauri/icons/Square310x310Logo.png
diff --git a/Slopify/src-tauri/icons/Square44x44Logo.png b/Slopify/src-tauri/icons/Square44x44Logo.png
diff --git a/Slopify/src-tauri/icons/Square71x71Logo.png b/Slopify/src-tauri/icons/Square71x71Logo.png
diff --git a/Slopify/src-tauri/icons/Square89x89Logo.png b/Slopify/src-tauri/icons/Square89x89Logo.png
diff --git a/Slopify/src-tauri/icons/StoreLogo.png b/Slopify/src-tauri/icons/StoreLogo.png
diff --git a/Slopify/src-tauri/icons/icon.png b/Slopify/src-tauri/icons/icon.png
diff --git a/Slopify/src-tauri/tauri.conf.json b/Slopify/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Slopify",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "identifier": "com.slopify.app",
   "build": {
     "beforeDevCommand": "npm run dev",
@@ -12,7 +12,7 @@
   "app": {
     "windows": [
       {
-        "title": "Slopify | v0.7.0",
+        "title": "Slopify | v0.7.2",
         "minWidth": 900,
         "minHeight": 800,
         "center": true,

diff --git a/Slopify/src/components/MessageForm.jsx b/Slopify/src/components/MessageForm.jsx
@@ -43,7 +43,7 @@ export default function MessageForm() {
     }
   };
 
-  const handleEmojiClick = (emojiKey) => {
+  const handleEmojiClick = (event, emojiKey) => {
     const emojiText = `:${emojiKey}:`;
     const newMessage = message + emojiText;
     const newCharCount = 1000 - newMessage.length;
@@ -53,8 +53,10 @@ export default function MessageForm() {
       setCharCount(newCharCount);
     }
 
-    setEmojiPickerVisible(false);
-  }
+    if (!event.shiftKey) {
+      setEmojiPickerVisible(false);
+    }
+  };
 
   const getColor = () => {
     if (charCount <= 0) return "black";
@@ -63,12 +65,28 @@ export default function MessageForm() {
     return "white";
   };
 
-  useEffect(() => {
-  }, [charCount]);
+  useEffect(() => {}, [charCount]);
 
   return (
-    <form onSubmit={handleSubmit} style={{ marginTop: "1rem", position: "relative", width: "100%", display: "flex", flexDirection: "row", alignItems: "center" }}>
-      <div style={{ position: "relative", display: "flex", alignItems: "center", width: "100%" }}>
+    <form
+      onSubmit={handleSubmit}
+      style={{
+        marginTop: "1rem",
+        position: "relative",
+        width: "100%",
+        display: "flex",
+        flexDirection: "row",
+        alignItems: "center",
+      }}
+    >
+      <div
+        style={{
+          position: "relative",
+          display: "flex",
+          alignItems: "center",
+          width: "100%",
+        }}
+      >
         <input
           type="text"
           placeholder="Message your fellow sloppers..."
@@ -119,7 +137,7 @@ export default function MessageForm() {
               alt={emojiKey}
               title={emojiKey}
               style={{ width: "40px", height: "40px", cursor: "pointer" }}
-              onClick={() => handleEmojiClick(emojiKey)}
+              onClick={(event) => handleEmojiClick(event, emojiKey)}
             />
           ))}
         </div>