fix(Grid): cleaned up needless context

N00nDay · Nov 20, 2022 · 1a31490 · 1a31490
1 parent 5eeb627
commit 1a31490
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/src/lib/components/grid/Col.svelte b/src/lib/components/grid/Col.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-	import { ROW_CONTEXT_ID } from './Row.svelte';
-	import { useContext } from '../../utils/useContext';
 	import { getContext } from 'svelte';
 	import { twMerge } from 'tailwind-merge';
 	import { get_current_component } from 'svelte/internal';
@@ -9,12 +7,7 @@
 	import { exclude } from '../../utils/exclude';
 	const forwardEvents = forwardEventsBuilder(get_current_component());
 
-	useContext({
-		context_id: ROW_CONTEXT_ID,
-		parent: 'Row',
-		component: 'Col'
-	});
-	const { padding }: { padding: string } = getContext(ROW_CONTEXT_ID);
+	const padding: string = getContext('padding');
 
 	const defaultClass = 'col';
 	$: finalClass = twMerge(defaultClass, $$props.class);

diff --git a/src/lib/components/grid/Row.svelte b/src/lib/components/grid/Row.svelte
@@ -1,11 +1,6 @@
-<script lang="ts" context="module">
+<script lang="ts">
 	import { setContext } from 'svelte';
 	import { twMerge } from 'tailwind-merge';
-
-	export const ROW_CONTEXT_ID = 'row-context-id';
-</script>
-
-<script lang="ts">
 	import type TwSizes from '../../types/twSizes';
 	import { twSizes } from '../../utils/twSizes';
 	import { get_current_component } from 'svelte/internal';
@@ -32,9 +27,7 @@
 		padding = 'padding: 0;';
 	}
 
-	setContext(ROW_CONTEXT_ID, {
-		padding
-	});
+	setContext('padding', padding);
 
 	const defaultClass = 'relative mr-0 ml-0 block box-border';
 	$: finalClass = twMerge(defaultClass, $$props.class);