Skip to content

Commit ae01421

Browse files
danharrindanharrin
committed
Merge branch '4.x' into new-v4-website-redesign
2 parents c7d3d3c + b6f81b1 commit ae01421

File tree

8 files changed

+144
-10
lines changed

8 files changed

+144
-10
lines changed

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ composer.lock
66
docs/dist
77
docs/filament
88
docs/node_modules
9+
docs/preserved-dist
910
docs/src/navigation.json
1011
docs/src/pages
1112
docs/torchlight-cache

‎docs/src/components/Aside.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const { variant } = Astro.props as Props;
1010

1111
<div
1212
class:list={[
13-
"my-3 rounded-lg border-s-4 px-4 py-3 prose-p:my-0",
13+
"mb-6 rounded-lg border-s-4 px-4 py-3 prose-p:my-0",
1414
{
1515
"border-purple-400 bg-purple-400/10 text-purple-950 dark:bg-purple-500/20 dark:text-purple-100 prose-code:[p_&]:bg-purple-600/10 prose-code:dark:[p_&]:bg-white/20":
1616
variant === "tip",

‎docs/src/components/AutoScreenshot.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const image = fs.readFileSync(new URL(
1111
const dimensions = probe.sync(image);
1212
---
1313

14-
<div style={`aspect-ratio: ${dimensions.width} / ${dimensions.height}`} class="rounded-xl ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10">
14+
<div style={`aspect-ratio: ${dimensions.width} / ${dimensions.height}`} class="rounded-xl mb-6 ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10">
1515
<img
1616
src={`/docs/${version}/images/light/${name}.jpg`}
1717
alt={alt}

‎docs/src/components/Disclosure.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<details
22
{...Astro.props}
3-
class="rounded-lg bg-[#ffede0] dark:bg-[#100f1b] border-2 border-[#ffd6b6] dark:border-[#282732] px-4 py-2 mb-3"
3+
class="rounded-lg bg-[#ffede0] dark:bg-[#100f1b] border-2 border-[#ffd6b6] dark:border-[#282732] px-4 py-2 mb-6"
44
>
55
<summary class="font-medium">
66
<slot name="summary" />

‎docs/src/components/LaracastsBanner.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if (series === 'building-advanced-components') {
2626
---
2727

2828
<div
29-
class="not-prose w-full max-w-5xl p-8 min-[900px]:p-10 rounded-2xl bg-gradient-to-t from-[#101E34] to-[#1A3053] text-white flex gap-3 min-[900px]:gap-10 items-start flex-col min-[900px]:flex-row"
29+
class="not-prose w-full max-w-5xl p-8 min-[900px]:p-10 rounded-2xl bg-gradient-to-t from-[#101E34] to-[#1A3053] text-white flex gap-3 min-[900px]:gap-10 items-start flex-col min-[900px]:flex-row mb-6"
3030
>
3131
<div class="flex min-[900px]:flex-col items-center gap-y-3 gap-x-5 shrink-0 min-[900px]:pt-1.5">
3232
<!-- Filament Logo -->

‎docs/src/components/RadioGroup.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const { model } = Astro.props;
3939
x-id="['radio-group-label']"
4040
x-model={model}
4141
x-modelable="value"
42-
class="not-prose grid gap-3 max-w-lg w-full"
42+
class="not-prose grid gap-3 max-w-lg w-full mb-6"
4343
>
4444
<label x-bind:id="$id('radio-group-label')" role="none" class="sr-only">
4545
Selected option: <span x-text="value"></span>

‎docs/src/components/Tabs.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const { headers } = Astro.props;
2121
}
2222
}"
2323
x-id="['tab']"
24-
class="not-prose my-6"
24+
class="not-prose mb-6"
2525
>
2626
<ul
2727
x-ref="tablist"

‎docs/src/components/UtilityInjection.astro‎

Lines changed: 137 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,74 @@ let utilities = [
103103
description: '[Actions in tables only] The table object that this action belongs to.',
104104
},
105105
],
106+
actionGroups: [
107+
{
108+
name: 'Action group',
109+
type: 'Filament\\Actions\\ActionGroup',
110+
parameter: '$group',
111+
description: 'The current action group instance.',
112+
},
113+
{
114+
name: 'Livewire',
115+
type: 'Livewire\\Component',
116+
parameter: '$livewire',
117+
description: 'The Livewire component instance.',
118+
},
119+
{
120+
name: 'Eloquent model FQN',
121+
type: '?string<Illuminate\\Database\\Eloquent\\Model>',
122+
parameter: '$model',
123+
description: 'The Eloquent model FQN for the current action group, if one is attached.',
124+
},
125+
{
126+
name: 'Eloquent record',
127+
type: '?Illuminate\\Database\\Eloquent\\Model',
128+
parameter: '$record',
129+
description: 'The Eloquent record for the current action group, if one is attached.',
130+
},
131+
{
132+
name: 'Mounted actions',
133+
type: 'array<Filament\\Actions\\Action>',
134+
parameter: '$mountedActions',
135+
description: 'The array of actions that are currently mounted in the Livewire component. This is useful for accessing data from parent actions.',
136+
},
137+
{
138+
name: 'Schema',
139+
type: 'Filament\\Schemas\\Schema',
140+
parameter: '$schema',
141+
description: '[Action groups in schemas only] The schema object that this action group belongs to.',
142+
},
143+
{
144+
name: 'Schema component',
145+
type: 'Filament\\Schemas\\Components\\Component',
146+
parameter: '$schemaComponent',
147+
description: '[Action groups in schemas only] The schema component that this action group belongs to.',
148+
},
149+
{
150+
name: 'Schema get function',
151+
type: 'Filament\\Schemas\\Components\\Utilities\\Get',
152+
parameter: '$schemaGet',
153+
description: '[Action groups in schemas only] A function for retrieving values from the schema data. Validation is not run on form fields.',
154+
},
155+
{
156+
name: 'Schema component state',
157+
type: 'mixed',
158+
parameter: '$schemaComponentState',
159+
description: '[Action groups in schemas only] The current value of the schema component.',
160+
},
161+
{
162+
name: 'Schema operation',
163+
type: 'string',
164+
parameter: '$schemaOperation',
165+
description: '[Action groups in schemas only] The current operation being performed by the schema. Usually <code>create</code>, <code>edit</code>, or <code>view</code>.',
166+
},
167+
{
168+
name: 'Table',
169+
type: 'Filament\\Tables\\Table',
170+
parameter: '$table',
171+
description: '[Action groups in tables only] The table object that this action group belongs to.',
172+
},
173+
],
106174
formFields: [
107175
{
108176
name: 'Field',
@@ -153,6 +221,70 @@ let utilities = [
153221
description: 'The Eloquent record for the current schema.',
154222
},
155223
],
224+
exportColumns: [
225+
{
226+
name: 'Export column',
227+
type: 'Filament\\Actions\\Exports\\ExportColumn',
228+
parameter: '$column',
229+
description: 'The current export column instance.',
230+
},
231+
{
232+
name: 'Exporter',
233+
type: '?Filament\\Actions\\Exports\\Exporter',
234+
parameter: '$exporter',
235+
description: 'The instance of the exporter class that is currently being used for exporting data.',
236+
},
237+
{
238+
name: 'Options',
239+
type: 'array<string, mixed>',
240+
parameter: '$options',
241+
description: 'The options that were defined when the export started.',
242+
},
243+
{
244+
name: 'Eloquent record',
245+
type: '?Illuminate\\Database\\Eloquent\\Model',
246+
parameter: '$record',
247+
description: 'The Eloquent record that is currently being exported.',
248+
},
249+
],
250+
importColumns: [
251+
{
252+
name: 'Import column',
253+
type: 'Filament\\Actions\\Imports\\ImportColumn',
254+
parameter: '$column',
255+
description: 'The current import column instance.',
256+
},
257+
{
258+
name: 'Data',
259+
type: 'array<string, mixed>',
260+
parameter: '$data',
261+
description: 'The processed data for the record that is currently being imported.',
262+
},
263+
{
264+
name: 'Importer',
265+
type: '?Filament\\Actions\\Imports\\Importer',
266+
parameter: '$importer',
267+
description: 'The instance of the importer class that is currently being used for importing data.',
268+
},
269+
{
270+
name: 'Options',
271+
type: 'array<string, mixed>',
272+
parameter: '$options',
273+
description: 'The options that were defined when the import started.',
274+
},
275+
{
276+
name: 'Original data',
277+
type: 'array<string, mixed>',
278+
parameter: '$originalData',
279+
description: 'The original data for the record that is currently being imported, before it was processed.',
280+
},
281+
{
282+
name: 'Eloquent record',
283+
type: '?Illuminate\\Database\\Eloquent\\Model',
284+
parameter: '$record',
285+
description: 'The Eloquent record that is currently being imported.',
286+
},
287+
],
156288
infolistEntries: [
157289
{
158290
name: 'Entry',
@@ -302,22 +434,23 @@ utilities = Array.from(new Map(utilities.map((utility) => [utility.parameter, ut
302434
303435
const link = {
304436
actions: `/docs/${version}/actions/overview#action-utility-injection`,
437+
actionGroups: `/docs/${version}/actions/overview#action-utility-injection`,
305438
formFields: `/docs/${version}/forms/overview#field-utility-injection`,
306439
infolistEntries: `/docs/${version}/infolists/overview#entry-utility-injection`,
307440
schemaComponents: `/docs/${version}/schemas/overview#component-utility-injection`,
308441
tableColumns: `/docs/${version}/tables/columns/overview#column-utility-injection`,
309442
tableFilters: `/docs/${version}/tables/filters/overview#filter-utility-injection`,
310-
}[set]
443+
}[set] ?? null
311444
---
312445

313-
<details class="rounded-lg bg-[#ffede0] dark:bg-[#100f1b] border-2 border-[#ffd6b6] dark:border-[#282732] px-4 py-2">
446+
<details class="rounded-lg mb-6 bg-[#ffede0] dark:bg-[#100f1b] border-2 border-[#ffd6b6] dark:border-[#282732] px-4 py-2">
314447
<summary class="font-medium">
315448
<slot />
316449
</summary>
317450

318-
<a href={link} target="_blank" class="mt-3">
451+
{link && <a href={link} target="_blank" class="mt-3">
319452
Learn more about utility injection.
320-
</a>
453+
</a>}
321454

322455
<table class="block overflow-x-auto whitespace-nowrap mt-3 mb-0">
323456
<thead>

0 commit comments

Comments
 (0)