@teammodlr/ui-kit 2.1.69 → 2.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teammodlr/ui-kit",
-  "version": "2.1.69",
+  "version": "2.1.70",
   "description": "",
   "main": "lib/index.cjs.js",
   "module": "lib/index.es.js",

package/src/components/colorpicker/ColorPicker.vue

@@ -4,9 +4,15 @@
             <slot :r="finalColor.r" :g="finalColor.g" :b="finalColor.b" :a="finalColor.a" :hex="hexInput"
                 :transparent="style.transparent">
                 <div>
-                    <div :class="style.referenceColor"
-                        :style="{ backgroundColor: `rgba(${finalColor.r}, ${finalColor.g}, ${finalColor.b}, ${finalColor.a})` }">
-                    </div>
+                    <template v-if="modelValue === 'inherit'">
+                        <div :style="{ border: '1px dashed #999', padding: '8px', textAlign: 'center' }">Inherit</div>
+                    </template>
+                    <template v-else>
+                        <!-- Regular color display -->
+                        <div :class="style.referenceColor"
+                            :style="{ backgroundColor: `rgba(${finalColor.r}, ${finalColor.g}, ${finalColor.b}, ${finalColor.a})` }">
+                        </div>
+                    </template>
                 </div>
             </slot>
         </div>
@@ -24,9 +30,8 @@
 
                     <div :class="style.colorActions">
                         <template v-if="canPickColor">
-                            <button role="button" :disabled="!canPickColor" :class="style.eyeDrop"
-                                @click="openEyeDropper">
-                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none"
+                            <MButton icon :disabled="!canPickColor" :class="style.eyeDrop" @click="openEyeDropper">
+                                <svg width="18" height="18" viewBox="0 0 24 24" fill="none"
                                     xmlns="http://www.w3.org/2000/svg">
                                     <path
                                         d="M20.3847 2.87868C19.2132 1.70711 17.3137 1.70711 16.1421 2.87868L14.0202 5.00052L13.313 4.29332C12.9225 3.9028 12.2894 3.9028 11.8988 4.29332C11.5083 4.68385 11.5083 5.31701 11.8988 5.70754L17.5557 11.3644C17.9462 11.7549 18.5794 11.7549 18.9699 11.3644C19.3604 10.9739 19.3604 10.3407 18.9699 9.95018L18.2629 9.24316L20.3847 7.12132C21.5563 5.94975 21.5563 4.05025 20.3847 2.87868Z"
@@ -35,7 +40,7 @@
                                         d="M11.9297 7.09116L4.1515 14.8693C3.22786 15.793 3.03239 17.169 3.5651 18.2842L1.99994 19.8493L3.41415 21.2635L4.97931 19.6984C6.09444 20.2311 7.4705 20.0356 8.39414 19.112L16.1723 11.3338L11.9297 7.09116ZM13.3439 11.3338L11.9297 9.91959L5.56571 16.2835C5.17518 16.6741 5.17518 17.3072 5.56571 17.6978C5.95623 18.0883 6.5894 18.0883 6.97992 17.6978L13.3439 11.3338Z"
                                         fill="currentColor" />
                                 </svg>
-                            </button>
+                            </MButton>
                         </template>
                         <template v-else>
                             <div :class="style.preview">
@@ -81,6 +86,17 @@
                             </svg>
 
                         </MButton>
+                        <MButton icon @click.prevent="toggleInherit">
+                            <svg style="width: 18px; height: 18px;" 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">
+                                <path d="M21 6H3" />
+                                <path d="M7 12H3" />
+                                <path d="M7 18H3" />
+                                <path d="M12 18a5 5 0 0 0 9-3 4.5 4.5 0 0 0-4.5-4.5c-1.33 0-2.54.54-3.41 1.41L11 14" />
+                                <path d="M11 10v4h4" />
+                            </svg>
+                        </MButton>
                     </div>
                 </div>
             </transition>
@@ -181,6 +197,9 @@ export default defineComponent({
         })
 
         const finalColor = computed(() => {
+            if (hexInput.value === "inherit") {
+                return { r: 0, g: 0, b: 0, a: 1 };
+            }
             return HSVToRGBA(hueSlider.value * 3.6, brightness.value, saturation.value, opacitySlider.value / 100);
         });
 
@@ -193,6 +212,10 @@ export default defineComponent({
         };
 
         const setInputs = () => {
+            if (hexInput.value === "inherit") {
+                return;
+            }
+
             hexInput.value = RGBAToHex(finalColor.value.r, finalColor.value.g, finalColor.value.b, finalColor.value.a);
             rInput.value = finalColor.value.r.toString();
             gInput.value = finalColor.value.g.toString();
@@ -217,12 +240,24 @@ export default defineComponent({
         }
 
         const updateFromHex = () => {
-            let color = hexToRGB(hexInput.value, finalColor.value.r, finalColor.value.g, finalColor.value.b, finalColor.value.a);
+            if (hexInput.value === "inherit") {
+                return;
+            }
+            const color = hexToRGB(hexInput.value);
             updateFromHSV(RGBToHSV(color.r, color.g, color.b), color.a);
             if (modelModifiers.lazy) {
                 emitModelValue();
             }
-        }
+        };
+
+        const toggleInherit = () => {
+            if (props.modelValue === "inherit") {
+                hexInput.value = "#FFFFFF";
+            } else {
+                hexInput.value = "inherit";
+            }
+            emitModelValue();
+        };
 
         const updateFromRGB = () => {
             let red = parseInt(rInput.value);
@@ -274,7 +309,7 @@ export default defineComponent({
         watch(() => props.modelValue, () => {
             let val = props.modelValue;
             if (!val || val.trim() === "") {
-                val = props.defaultColor ?? "#FFFFFF"
+                val = props.defaultColor ?? "#FFFFFF";
             }
             hexInput.value = val;
             updateFromHex();
@@ -299,9 +334,13 @@ export default defineComponent({
             isOpen.value = false;
         });
 
+
         watch(() => eyeDropColor.value, () => {
-            hexInput.value = eyeDropColor.value;
-            updateFromHex();
+            if (eyeDropColor.value) {
+                hexInput.value = eyeDropColor.value;
+                emit('update:modelValue', eyeDropColor.value);
+                updateFromHex();
+            }
         });
 
         const openEyeDropper = () => {
@@ -350,7 +389,8 @@ export default defineComponent({
             canPickColor,
             openEyeDropper,
             scale,
-            onSliderChangeComplete
+            onSliderChangeComplete,
+            toggleInherit
         };
     }
 })