Made kalk_web shadow dom element again, and started to use a polyfill to make it work in other browsers

This commit is contained in:
PaddiM8 2021-01-06 01:48:43 +01:00
parent e31f983c21
commit f10d10168e
6 changed files with 20 additions and 40 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@paddim8/kalk-component", "name": "@paddim8/kalk-component",
"version": "1.0.6", "version": "1.0.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -7920,11 +7920,6 @@
"strip-indent": "^3.0.0" "strip-indent": "^3.0.0"
} }
}, },
"svelte-tag": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/svelte-tag/-/svelte-tag-1.0.1.tgz",
"integrity": "sha512-d3+bXGCZ/aSfFc1QBBGJFFeiQ+sukks+GrBQbk1YTYxA6OhlfFbWfFcyBaz7ONhspOBN9gbRq4+AZYhORALQ+A=="
},
"svgo": { "svgo": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",

View File

@ -1,6 +1,6 @@
{ {
"name": "@paddim8/kalk-component", "name": "@paddim8/kalk-component",
"version": "1.0.7", "version": "1.0.8",
"description": "A Svelte component for kalk, a calculator that supports user-defined functions and variables.", "description": "A Svelte component for kalk, a calculator that supports user-defined functions and variables.",
"svelte": "src/main.ts", "svelte": "src/main.ts",
"main": "public/build/bundle.js", "main": "public/build/bundle.js",
@ -46,7 +46,6 @@
"svelte-check": "^1.1.15", "svelte-check": "^1.1.15",
"svelte-loader-hot": "^0.3.1", "svelte-loader-hot": "^0.3.1",
"svelte-preprocess": "^4.6.1", "svelte-preprocess": "^4.6.1",
"svelte-tag": "^1.0.1",
"terser-webpack-plugin": "^4.2.3", "terser-webpack-plugin": "^4.2.3",
"ts-loader": "^8.0.2", "ts-loader": "^8.0.2",
"ts-node": "^9.0.0", "ts-node": "^9.0.0",
@ -56,7 +55,8 @@
"webpack-dev-server": "^3.11.0" "webpack-dev-server": "^3.11.0"
}, },
"dependencies": { "dependencies": {
"@paddim8/kalk": "^1.4.2" "@paddim8/kalk": "^1.4.2",
"shadow-selection-polyfill": "^1.1.0"
}, },
"browserslist": [ "browserslist": [
"defaults" "defaults"

View File

@ -3,17 +3,18 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.console-line-tg638d3 { p {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
word-wrap: break-word; word-wrap: break-word;
} }
.console-line-tg638d3.result { .result {
margin-bottom: 10px; margin-bottom: 10px;
} }
</style> </style>
<p class="console-line-tg638d3" class:result={!byuser}> <svelte:options tag="console-line" />
<p class:result={!byuser}>
<slot /> <slot />
</p> </p>

View File

@ -2,6 +2,7 @@
import { afterUpdate } from "svelte"; import { afterUpdate } from "svelte";
import type { Context } from "@paddim8/kalk"; import type { Context } from "@paddim8/kalk";
import ConsoleLine from "./ConsoleLine.svelte"; import ConsoleLine from "./ConsoleLine.svelte";
import * as shadow from "shadow-selection-polyfill";
// Props, HTML doesn't recognise them if they're not like this // Props, HTML doesn't recognise them if they're not like this
export let identifiercolor = "cornflowerblue"; export let identifiercolor = "cornflowerblue";
@ -18,6 +19,7 @@
let outputElement: HTMLElement; let outputElement: HTMLElement;
let kalkContext: Context; let kalkContext: Context;
let selectedLineOffset: number = 0; let selectedLineOffset: number = 0;
let calculatorElement: HTMLElement;
afterUpdate(() => { afterUpdate(() => {
// Scroll to bottom // Scroll to bottom
@ -123,8 +125,10 @@
} }
function getCursorPos(element: HTMLInputElement): number { function getCursorPos(element: HTMLInputElement): number {
const selection = document.getSelection(); const shadowRoot = calculatorElement.getRootNode() as ShadowRoot;
const range = selection.getRangeAt(0); const range = shadow.getRange(shadowRoot);
//const selection = shadowRoot.getSelection();
//const range = selection.getRangeAt(0);
const preCaretRange = range.cloneRange(); const preCaretRange = range.cloneRange();
preCaretRange.selectNodeContents(element); preCaretRange.selectNodeContents(element);
preCaretRange.setEnd(range.endContainer, range.endOffset); preCaretRange.setEnd(range.endContainer, range.endOffset);
@ -240,7 +244,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.calculator-tg638d3 { .calculator {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
@ -299,16 +303,17 @@
} }
</style> </style>
<div class="calculator-tg638d3"> <svelte:options tag="kalk-calculator" />
<div class="calculator" bind:this={calculatorElement}>
<div class="output" bind:this={outputElement}> <div class="output" bind:this={outputElement}>
<slot /> <slot />
{#each outputLines as line} {#each outputLines as line}
<ConsoleLine byuser={line[1]}> <console-line byuser={line[1]}>
{#if line[1]} {#if line[1]}
<span style="color: {promptcolor}">&gt;&gt;</span> <span style="color: {promptcolor}">&gt;&gt;</span>
{/if} {/if}
{@html line[0]} {@html line[0]}
</ConsoleLine> </console-line>
{/each} {/each}
</div> </div>
<div class="input-area"> <div class="input-area">

View File

@ -1,27 +1,6 @@
import "./public-path.js"; import "./public-path.js";
import KalkCalculator from './KalkCalculator.svelte'; import KalkCalculator from './KalkCalculator.svelte';
import ConsoleLine from './ConsoleLine.svelte'; import ConsoleLine from './ConsoleLine.svelte';
import component from "svelte-tag";
new component({
component: KalkCalculator,
tagname: "kalk-calculator",
attributes: [
"identifiercolor",
"operatorcolor",
"promptcolor",
"errorcolor",
"linkcolor",
"hinttext",
"autofocus"
]
});
new component({
component: ConsoleLine,
tagname: "console-line",
attributes: ["byuser"]
});
export { export {
KalkCalculator, KalkCalculator,

View File

@ -61,7 +61,7 @@ const config: webpack.Configuration & WebpackDevServer.Configuration = {
use: { use: {
loader: 'svelte-loader-hot', loader: 'svelte-loader-hot',
options: { options: {
//customElement: true, customElement: true,
dev: !prod, dev: !prod,
emitCss: prod, emitCss: prod,
hotReload: !prod, hotReload: !prod,