@nil-/doc 0.2.51 → 0.2.53

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @nil-/doc
 
+## 0.2.53
+
+### Patch Changes
+
+-   [doc][break] removed "scale" prop ([#92](https://github.com/njaldea/mono/pull/92))
+    [doc][fix] better block scrollable handling
+    [doc][fix] better style to vanilla-color popup
+
+## 0.2.52
+
+### Patch Changes
+
+-   [doc][fix] fix layout scrollable sections ([#90](https://github.com/njaldea/mono/pull/90))
+
+-   [doc][patch] restructure code ([#90](https://github.com/njaldea/mono/pull/90))
+
+-   [doc][patch] use vannilla-color library for color picker ([#90](https://github.com/njaldea/mono/pull/90))
+    [doc][fix] removed position relative and overflow scroll for misc (controls)
+
+-   [doc][fix] content fill width/height ([#90](https://github.com/njaldea/mono/pull/90))
+
+-   [doc][new] added offset Layout.svelte and sveltekit for keeping state ([#90](https://github.com/njaldea/mono/pull/90))
+
 ## 0.2.51
 
 ### Patch Changes

package/components/{etc/Base.svelte → Base.svelte}

@@ -1,23 +1,22 @@
-<script>export let dark = true;
+<script>export let dark = false;
+export let fill = false;
 </script>
 
-<div class:dark>
+<div class:dark class:fill>
     <slot />
 </div>
 
+<!-- prettier-ignore -->
 <style>
     @import url("https://fonts.googleapis.com/css?family=Fira%20Code");
 
     div {
-        width: 100%;
-        height: 100%;
         font-family: "Fira Code", "Courier New", Courier, monospace;
+    }
 
-        --i-nil-doc-nav-hovered: var(--nil-doc-nav-hovered, hsla(203, 98%, 50%, 0.07));
-        --i-nil-doc-nav-selected: var(--nil-doc-nav-selected, hsla(203, 98%, 50%, 0.822));
-        --i-nil-doc-nav-selected-color: var(--nil-doc-nav-selected-color, black);
-
-        --i-nil-doc-transition-time: var(--nil-doc-transition-time, 350ms);
+    .fill {
+        width: 100%;
+        height: 100%;
     }
 
     div {
@@ -41,10 +40,10 @@
     div.dark {
         --i-nil-doc-color: var(--nil-doc-color, hsl(0, 0%, 80%));
         --i-nil-doc-color-scheme: var(--nil-doc-color-scheme, dark);
-    
+
         --i-nil-doc-bg-color: var(--nil-doc-bg-color, hsl(210, 6%, 7%));
         --i-nil-doc-content-outline-color: var(--nil-doc-content-outline-color, hsla(0, 0%, 100%, 0.3));
-    
+
         --i-nil-doc-block-bg-color: var(--nil-doc-block-bg-color, hsla(200, 4%, 7%, 0.3));
         --i-nil-doc-block-outline-color: var(--nil-doc-block-outline-color, hsla(0, 0%, 1000%, 0.3));
 
@@ -55,4 +54,12 @@
         --i-nil-doc-controls-s: var(--nil-doc-controls-s, hsl(213, 26%, 11%));
         --i-nil-doc-controls-hover: var(--nil-doc-controls-hover, hsl(203, 100%, 15%));
     }
+
+    div {
+        --i-nil-doc-nav-hovered: var(--nil-doc-nav-hovered, hsla(203, 98%, 50%, 0.1));
+        --i-nil-doc-nav-page-hovered: var(--nil-doc-nav-page-hovered, hsla(203, 98%, 50%, 0.5));
+        --i-nil-doc-nav-selected: var(--nil-doc-nav-selected, hsla(203, 98%, 50%, 0.85));
+
+        --i-nil-doc-transition-time: var(--nil-doc-transition-time, 350ms);
+    }
 </style>

package/components/{etc/Base.svelte.d.ts → Base.svelte.d.ts}

@@ -2,6 +2,7 @@ import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
     props: {
         dark?: boolean | undefined;
+        fill?: boolean | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/components/block/Block.svelte

@@ -5,7 +5,7 @@
   initControlsState,
   initOrientation
 } from "./context";
-import Base from "../etc/Base.svelte";
+import Base from "../Base.svelte";
 import { getTheme, initTheme } from "../context";
 import Button from "./icons/Button.svelte";
 import Position from "./icons/Position.svelte";
@@ -51,7 +51,7 @@ const cycleMode = () => {
 -->
 
 <Base dark={$dark}>
-    <div class="block" class:columns={$columns} class:dark={$dark}>
+    <div class="relative">
         <div class="buttons">
             <Button scale on:click={cycleMode} title={$state.mode}>
                 <ControlView mode={$state.mode} />
@@ -60,28 +60,52 @@ const cycleMode = () => {
                 <Position position={$state.position} />
             </Button>
         </div>
-        <slot />
+    </div>
+    <div class="outer">
+        <div class="scrollable block" class:columns={$columns}>
+            <slot />
+        </div>
     </div>
 </Base>
 
 <style>
     .block {
         display: grid;
-        border-radius: 0.3125rem;
         grid-auto-rows: 1fr;
         grid-auto-columns: auto;
         grid-auto-flow: row;
+    }
 
+    .outer {
+        border-radius: 0.5rem;
+        padding: 1.75rem 0.2rem 0.75rem 0.2rem;
         min-width: 10rem;
+        margin: 1px;
+        outline: solid 1px white;
+    }
 
-        padding: 1.75rem 0.2rem 0.5rem 0.2rem;
-        gap: 0.1875rem;
+    .scrollable {
+        width: 100%;
+        height: 100%;
+        overflow: scroll;
+        /* Firefox */
+        scrollbar-width: none;
+        /* IE and Edge */
+        -ms-overflow-style: none;
+    }
+
+    .scrollable::-webkit-scrollbar {
+        display: none;
+    }
+
+    .relative {
+        z-index: 10;
         position: relative;
     }
 
     .buttons {
         position: absolute;
-        width: calc(1.75rem * 2);
+        width: 3.5rem;
         height: 1.75rem;
         right: 1rem;
         top: 0rem;
@@ -95,13 +119,17 @@ const cycleMode = () => {
         grid-auto-flow: column;
     }
 
-    .block {
+    .outer {
         color: var(--i-nil-doc-color);
         color-scheme: var(--i-nil-doc-color-scheme);
         background-color: var(--i-nil-doc-block-bg-color);
-        box-shadow: 0px 0px 5px 0px var(--i-nil-doc-block-outline-color);
+        box-shadow: 0 0 0.5rem 0 var(--i-nil-doc-block-outline-color);
         outline: 1px solid var(--i-nil-doc-block-outline-color);
         transition: color var(--i-nil-doc-transition-time),
             background-color var(--i-nil-doc-transition-time);
     }
+
+    .block {
+        outline: 1px solid var(--i-nil-doc-block-outline-color);
+    }
 </style>

package/components/block/Instance.svelte

@@ -9,7 +9,6 @@ $:
   expanded = $controlsState.position !== "hidden";
 export let defaults = void 0;
 export let noreset = false;
-export let scale = false;
 let key = false;
 beforeUpdate(() => key = !key);
 const resolveArgs = resolve;
@@ -25,8 +24,8 @@ let handlers = {};
     See [documentation](https://mono-doc.vercel.app/3-Components/2-Block/1-Content/1-Instance) for more details.
 -->
 
-<div class="instance" class:scale class:cside={expanded && "right" === $controlsState.position}>
-    <div class="content scrollable">
+<div class="instance" class:cside={expanded && "right" === $controlsState.position}>
+    <div class="content">
         {#if noreset}
             <slot props={resolveArgs(defaults ?? {}, bound)} events={handlers} {key} />
         {:else}
@@ -36,7 +35,7 @@ let handlers = {};
         {/if}
     </div>
     {#if expanded}
-        <div class="misc scrollable">
+        <div class="misc">
             <Props
                 infos={$controls.props}
                 bind:values={bound}
@@ -64,36 +63,20 @@ let handlers = {};
 
 <style>
     .instance {
-        overflow: hidden;
-    }
-
-    .instance.scale {
-        transition: transform var(--i-nil-doc-transition-time);
-    }
-
-    .instance.scale:hover {
-        transform: scale(1.015);
+        width: 100%;
+        height: 100%;
     }
 
     .cside {
         display: grid;
-        grid-template-columns: 1fr 550px;
+        grid-template-columns: 1fr 35rem;
     }
 
     .content {
-        min-height: 100px;
-        border-radius: 0.3125rem;
-    }
-
-    div:not(.cside) > .misc {
-        border-bottom-left-radius: 0.3125rem;
-        border-bottom-right-radius: 0.3125rem;
-        user-select: none;
+        min-height: 6.25rem;
     }
 
-    .cside > .misc {
-        border-top-right-radius: 0.3125rem;
-        border-bottom-right-radius: 0.3125rem;
+    .misc {
         user-select: none;
     }
 
@@ -102,22 +85,9 @@ let handlers = {};
         border: 1px solid var(--i-nil-doc-block-outline-color);
     }
 
-    /* scrollable */
-    .scrollable {
-        overflow: scroll;
-        /* Firefox */
-        scrollbar-width: none;
-        /* IE and Edge */
-        -ms-overflow-style: none;
-    }
-
-    .scrollable::-webkit-scrollbar {
-        display: none;
-    }
-
     /* colors */
     .instance {
-        transition: background-color 350ms;
+        transition: background-color var(--i-nil-doc-transition-time);
         color: var(--i-nil-doc-color);
         background-color: var(--i-nil-doc-bg-color);
     }

package/components/block/Instance.svelte.d.ts

@@ -3,7 +3,6 @@ declare class __sveltets_Render<PropArgs> {
     props(): {
         defaults?: PropArgs | undefined;
         noreset?: boolean | undefined;
-        scale?: boolean | undefined;
     };
     events(): {} & {
         [evt: string]: CustomEvent<any>;

package/components/block/Template.svelte

@@ -8,7 +8,6 @@ const orientation = getOrientation();
 export let defaults = void 0;
 export let noreset = false;
 export let columns = false;
-export let scale = false;
 $:
   $defaultsStore = defaults ?? {};
 $:
@@ -28,7 +27,6 @@ const cast = (t) => t;
     <Instance
         defaults={resolveArgs($defaultsStore, param.values)}
         {noreset}
-        {scale}
         let:key
         let:props
         let:events

package/components/block/Template.svelte.d.ts

@@ -4,7 +4,6 @@ declare class __sveltets_Render<Args> {
         defaults?: Args | undefined;
         noreset?: boolean | undefined;
         columns?: boolean | undefined;
-        scale?: boolean | undefined;
     };
     events(): {} & {
         [evt: string]: CustomEvent<any>;

package/components/block/controls/{props/misc/Styler.svelte → Styler.svelte}

@@ -1,35 +1,22 @@
-<script>import { getTheme } from "../../../../context";
-const dark = getTheme();
+<script>export let type;
 </script>
 
-<!--
-    <div> this component
-        <div> Header
-            <div></div>
-            <div></div>
-            <div></div>
-        </div>
-        <div> Controls
-            <div></div>
-            <div></div>
-            <div></div>
-        </div>
-        ...
-    </div>
--->
-<div class:dark={$dark}>
+<div class:props={type === "props"} class:events={type === "events"}>
     <slot />
 </div>
 
 <style>
     div {
         display: grid;
-        overflow: hidden;
         min-width: 31.25rem;
         grid-auto-rows: 2rem;
         box-sizing: border-box;
     }
 
+    div.events {
+        height: 22rem;
+    }
+
     div :global(*),
     div :global(*::before),
     div :global(*::after) {
@@ -39,15 +26,23 @@ const dark = getTheme();
 
     div > :global(div) {
         display: grid;
+    }
+
+    div.props > :global(div) {
         grid-template-columns: minmax(15rem, 1fr) 12.5rem 2.5rem;
     }
 
+    div.events > :global(div) {
+        grid-template-columns: 2fr 3fr;
+        align-items: center;
+    }
+
     div > :global(div:first-child) {
         font-weight: bold;
         place-items: center;
     }
 
-    div > :global(div > div:not(:first-child)) {
+    div.props > :global(div > div:not(:first-child)) {
         display: grid;
         place-items: center;
     }
@@ -55,7 +50,6 @@ const dark = getTheme();
     div > :global(div > div:not(:first-child) > *) {
         width: 100%;
         height: 80%;
-        font-size: 1rem;
     }
 
     /* colors */

package/components/block/controls/{props/misc/Styler.svelte.d.ts → Styler.svelte.d.ts}

@@ -1,6 +1,8 @@
 import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
-    props: Record<string, never>;
+    props: {
+        type: "props" | "events";
+    };
     events: {
         [evt: string]: CustomEvent<any>;
     };

package/components/block/controls/events/Events.svelte

@@ -1,4 +1,4 @@
-<script>import Styler from "./misc/Styler.svelte";
+<script>import Styler from "../Styler.svelte";
 export let visible;
 export let events;
 export let handlers;
@@ -41,7 +41,7 @@ $:
 </script>
 
 {#if visible}
-    <Styler>
+    <Styler type={"events"}>
         <slot />
         {#each history as { count, detail, name }, i (i)}
             <div>

package/components/block/controls/props/Color.svelte

@@ -1,4 +1,23 @@
-<script>import { getName } from "./misc/utils";
+<script context="module">import Picker from "vanilla-picker";
+const colorSetter = (format, color) => {
+  switch (format) {
+    case "hex":
+      return color.hex.substring(0, 7);
+    case "hexa":
+      return color.hex.substring(0, 9);
+    case "hsl":
+      return color.hslString;
+    case "hsla":
+      return color.hslaString;
+    case "rgb":
+      return color.rgbString;
+    case "rgba":
+      return color.rgbaString;
+  }
+};
+</script>
+
+<script>import { getName, getFormat } from "./misc/utils";
 import { defaulter } from "./misc/defaulter";
 import NameHeader from "./misc/Name.svelte";
 export let value;
@@ -8,6 +27,30 @@ export let disabled = false;
 export let visible = false;
 let ivalue = value ?? defaulter(info);
 let enabled = value !== void 0;
+const action = (d, format) => {
+  d.style.borderColor = ivalue;
+  const picker = new Picker({
+    parent: d,
+    popup: "left",
+    editorFormat: format.substring(0, 3),
+    editor: false,
+    alpha: format.length === 4,
+    onChange: (color) => {
+      ivalue = colorSetter(getFormat(info), color);
+      d.style.borderColor = ivalue;
+    },
+    color: ivalue
+  });
+  return {
+    update: (format2) => {
+      picker.setOptions({
+        alpha: format2.length === 4,
+        editorFormat: format2.substring(0, 3)
+      });
+    },
+    destroy: () => picker.destroy()
+  };
+};
 $:
   value = enabled && !disabled ? ivalue : void 0;
 </script>
@@ -15,7 +58,37 @@ $:
 {#if visible}
     <div>
         <NameHeader name={getName(info)} {depth} />
-        <div><input type="color" bind:value={ivalue} disabled={!enabled || disabled} /></div>
+        <button use:action={getFormat(info)} disabled={!enabled || disabled}>
+            {ivalue}
+        </button>
         <div><input type="checkbox" bind:checked={enabled} {disabled} /></div>
     </div>
 {/if}
+
+<style>
+    button {
+        font-size: 0.6rem;
+        border-top-width: 1px;
+        border-bottom-width: 1px;
+        border-left-width: 10px;
+        border-right-width: 10px;
+        border-style: solid;
+        background-color: var(--i-nil-doc-bg-color);
+        outline: 1px solid gray;
+        margin-top: 3px;
+        margin-bottom: 3px;
+    }
+
+    button :global(.picker_wrapper),
+    button :global(.picker_arrow),
+    button :global(.picker_arrow::before),
+    button :global(.picker_arrow::after) {
+        background-color: var(--i-nil-doc-bg-color) !important;
+    }
+
+    button :global(.picker_done > button) {
+        background-image: initial;
+        background-color: var(--i-nil-doc-bg-color);
+        color: var(--i-nil-doc-color);
+    }
+</style>

package/components/block/controls/props/Object.svelte

@@ -20,7 +20,7 @@ $:
     <Component
         info={v}
         bind:value={ivalue[getName(v)]}
-        depth={depth + 10}
+        depth={depth + 1}
         disabled={!enabled || disabled}
         visible={visible && expand && enabled && !disabled}
     />

package/components/block/controls/props/Props.svelte

@@ -1,16 +1,16 @@
 <script>import Component from "./Component.svelte";
-import Styler from "./misc/Styler.svelte";
+import Styler from "../Styler.svelte";
 import { getName } from "./misc/utils";
 export let infos;
 export let values;
 export let visible;
 </script>
 
-<Styler>
+<Styler type={"props"}>
     {#if visible}
         <slot />
     {/if}
     {#each infos as info}
-        <Component {info} bind:value={values[getName(info)]} depth={10} {visible} />
+        <Component {info} bind:value={values[getName(info)]} depth={1} {visible} />
     {/each}
 </Styler>

package/components/block/controls/props/Range.svelte

@@ -50,7 +50,7 @@ $:
         width: 100%;
         display: grid;
         grid-template-columns: 4rem 1fr;
-        gap: 0.3125rem;
+        gap: 0.25rem;
         position: relative;
         box-sizing: border-box;
     }

package/components/block/controls/props/Tuple.svelte

@@ -20,7 +20,7 @@ $:
     <Component
         info={addName(`${i}`, v)}
         bind:value={ivalue[i]}
-        depth={depth + 10}
+        depth={depth + 1}
         disabled={!enabled || disabled}
         visible={visible && expand && enabled && !disabled}
     />

package/components/block/controls/props/misc/Name.svelte

@@ -3,7 +3,7 @@ export let name;
 export let expand = void 0;
 </script>
 
-<div class="override" style:padding-left={`${depth}px`} title={name}>
+<div class="override" style:padding-left={`${depth}rem`} title={name}>
     <div class="icon" class:expand={expand === true}>
         <div>
             {expand === undefined ? "-" : ">"}
@@ -17,10 +17,10 @@ export let expand = void 0;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
-        padding-right: 10px;
+        padding-right: 0.5rem;
 
         display: grid;
-        grid-template-columns: 20px 1fr;
+        grid-template-columns: 1.25rem 1fr;
         align-items: center;
     }
 
@@ -28,8 +28,8 @@ export let expand = void 0;
         display: flex;
         flex-direction: column;
         justify-content: center;
-        height: 15px;
-        width: 15px;
+        height: 1rem;
+        width: 1rem;
         transition: transform var(--i-nil-doc-transition-time);
     }
 

package/components/block/controls/props/misc/defaulter.d.ts

@@ -7,4 +7,5 @@ export declare function defaulter(i: Unionized<PropType<"range">>): number;
 export declare function defaulter(i: Unionized<PropType<"select">>): string;
 export declare function defaulter(i: Unionized<PropType<"text">>): string;
 export declare function defaulter(i: Unionized<PropType<"switch">>): boolean;
+export declare function defaulter(i: Unionized<PropType<"color">>): string;
 export declare function defaulter(i: Prop): ValueType;

package/components/block/controls/props/misc/defaulter.js

@@ -11,7 +11,7 @@ export function defaulter(i) {
         case "text":
             return "";
         case "color":
-            return "";
+            return "#ffffffff";
         case "select":
             return getValues(i)[0] ?? "";
         case "number":

package/components/block/controls/props/misc/utils.d.ts

@@ -5,7 +5,8 @@ export declare function getValues(info: Unionized<PropType<"select">>): Values<"
 export declare function getValues(info: Unionized<PropType<"object">>): Values<"object">;
 export declare function getValues(info: Unionized<PropType<"tuple">>): Values<"tuple">;
 export declare const getMin: (info: Unionized<PropType<"range">>) => number;
-export declare const getType: (info: Prop) => "number" | "object" | "select" | "text" | "color" | "switch" | "range" | "tuple";
+export declare const getType: (info: Prop) => "number" | "object" | "select" | "text" | "switch" | "range" | "tuple" | "color";
+export declare const getFormat: (info: Unionized<PropType<"color">>) => import("../../types").ColorFormat;
 export declare const getName: (info: Prop) => string;
 export declare const addName: (name: string, info: NonNamedProp) => Prop;
 export {};

package/components/block/controls/props/misc/utils.js

@@ -17,6 +17,12 @@ export const getType = (info) => {
     }
     return info.type;
 };
+export const getFormat = (info) => {
+    if (info instanceof Array) {
+        return info[2];
+    }
+    return info.format;
+};
 export const getName = (info) => {
     if (info instanceof Array) {
         return info[0];