[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasonvarga wants to merge 1 commit into from
Closed

[6.x] Optimize Blueprint JSON Payload #11993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions resources/js/components/fieldtypes/withDefaultConfig.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
const { common, types } = Statamic.$config.get('fieldtypeConfigs');

return { ...common, ...types[type], ...config }
}
20 changes: 11 additions & 9 deletions resources/js/components/ui/Publish/Field.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
return `${props.config.component || props.config.type}-fieldtype`;
return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
return props.config.actions && fieldActions.value?.length > 0;
return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
hiddenFields.value,
revealerFields.value,
setHiddenField
).showField(props.config, fullPath.value);
).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
() =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
if (containerReadOnly.value) return true;

if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

return isLocked.value || props.config.visibility === 'read_only' || false;
return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
// Todo: Find a way to not need to hard code this.
if (props.config.type === 'dictionary_fields') return 'div';
if (config.value.type === 'dictionary_fields') return 'div';

return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down
22 changes: 18 additions & 4 deletions src/Fields/Field.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

public function toPublishArray()
{
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
'handle' => $this->handle,
'prefix' => $this->prefix,
'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
'always_save' => $this->alwaysSave(),
]);

$defaults = [
...self::commonFieldOptions()->all()->map->defaultValue()->all(),
...[
'read_only' => false,
'always_save' => false,
'prefix' => null,
],
...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
];

// Return the array excluding keys where the value is the same as the default.
return collect($arr)
->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
->all();

return $arr;
}

public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
self::commonFieldOptions()->all()->map->defaultValue()->all(),
$this->config,
$fields->preProcess()->values()->all(),
[
'component' => $fieldtype->component(),
]
);
}

Expand Down
13 changes: 8 additions & 5 deletions src/Fields/Fieldtype.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
return $this;
}

public function removeField()
{
$this->field = null;

return $this;
}

public function field(): ?Field
{
return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

public function config(?string $key = null, $fallback = null)
{
if (! $this->field) {
return $fallback;
}

$config = $this->configFields()->all()
->map->defaultValue()
->merge($this->field->config());
->merge($this->field?->config() ?? []);

return $key
? ($config->get($key) ?? $fallback)
Expand Down
7 changes: 6 additions & 1 deletion src/Fields/FieldtypeRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
public function find($handle)
{
if (isset($this->fieldtypes[$handle])) {
return clone $this->fieldtypes[$handle];
return (clone $this->fieldtypes[$handle])->removeField();
}

if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
});
}

public function all()
{
return $this->handles()->map(fn ($handle) => $this->find($handle));
}

public function makeSelectableInForms($handle)
{
$this->selectableInForms[$handle] = true;
Expand Down
23 changes: 23 additions & 0 deletions src/Http/View/Composers/JavascriptComposer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
'customSvgIcons' => Icon::getCustomSvgIcons(),
'commandPaletteCategories' => Category::order(),
'fieldtypeConfigs' => $this->fieldtypeConfigs(),
];
}

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

return array_merge($fallbackTranslations, $translations);
}

private function fieldtypeConfigs(): array
{
// TODO: Cache this.
return [
'common' => [
...Field::commonFieldOptions()->values()->all(),
...[
'read_only' => false,
'always_save' => false,
'prefix' => null,
],
],
'types' => FieldtypeRepository::all()
->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
...$fieldtype->config(),
...['component' => $fieldtype->component()],
]])->all(),
];
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[6.x] Optimize Blueprint JSON Payload#11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

jasonvarga
wants to merge
1
commit into

from

 Closed


[6.x] Optimize Blueprint JSON Payload
#11993
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
resources/js/components/fieldtypes/withDefaultConfig.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
export default function withDefaultConfig(type, config) {
 const { common, types } = Statamic.$config.get('fieldtypeConfigs');

 return { ...common, ...types[type], ...config }
}

20 changes: 11 additions & 9 deletions
resources/js/components/ui/Publish/Field.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import { injectFieldsContext } from './FieldsProvider.vue';
import { Field, Icon, Tooltip, Label } from '@statamic/ui';
import FieldActions from '@statamic/components/field-actions/FieldActions.vue';
import ShowField from '@statamic/components/field-conditions/ShowField.js';
import withDefaultConfig from '@statamic/components/fieldtypes/withDefaultConfig.js';

const props = defineProps({
 config: {
Expand DownExpand Up@@ -34,10 +35,11 @@ const {
 setHiddenField,
} = injectContainerContext();
const { fieldPathPrefix, metaPathPrefix } = injectFieldsContext();
const handle = props.config.handle;
const config = computed(() => withDefaultConfig(props.config.type, props.config));
const handle = config.value.handle;

const fieldtypeComponent = computed(() => {
 return `${props.config.component || props.config.type}-fieldtype`;
 return `${config.value.component || config.value.type}-fieldtype`;
});

const fieldtypeComponentExists = computed(() => {
Expand All@@ -54,15 +56,15 @@ const meta = computed(() => {
const errors = computed(() => containerErrors.value[fullPath.value]);
const fieldId = computed(() => `field_${fullPath.value.replaceAll('.', '_')}`);
const namePrefix = '';
const isRequired = computed(() => props.config.required);
const isRequired = computed(() => config.value.required);
const fieldtype = useTemplateRef('fieldtype');

const fieldActions = computed(() => {
 return fieldtype.value ? fieldtype.value.fieldActions : [];
});

const shouldShowFieldActions = computed(() => {
 return props.config.actions && fieldActions.value?.length > 0;
 return config.value.actions && fieldActions.value?.length > 0;
});

function valueUpdated(value) {
Expand DownExpand Up@@ -108,10 +110,10 @@ const shouldShowField = computed(() => {
 hiddenFields.value,
 revealerFields.value,
 setHiddenField
 ).showField(props.config, fullPath.value);
 ).showField(config.value, fullPath.value);
});

const shouldShowLabelText = computed(() => !props.config.hide_display);
const shouldShowLabelText = computed(() => !config.value.hide_display);

const shouldShowLabel = computed(
 () =>
Expand All@@ -120,14 +122,14 @@ const shouldShowLabel = computed(
 isSyncable.value, // Need to see the icon
);

const isLocalizable = computed(() => props.config.localizable);
const isLocalizable = computed(() => config.value.localizable);

const isReadOnly = computed(() => {
 if (containerReadOnly.value) return true;

 if (isTrackingOriginValues.value && isSyncable.value && !isLocalizable.value) return true;

 return isLocked.value || props.config.visibility === 'read_only' || false;
 return isLocked.value || config.value.visibility === 'read_only' || false;
});

const isLocked = computed(() => false); // todo
Expand All@@ -144,7 +146,7 @@ const isSynced = computed(() => isSyncable.value && !localizedFields.value.inclu
const isNested = computed(() => fullPath.value.includes('.'));
const wrapperComponent = computed(() => {
 // Todo: Find a way to not need to hard code this.
 if (props.config.type === 'dictionary_fields') return 'div';
 if (config.value.type === 'dictionary_fields') return 'div';

 return asConfig.value && !isNested.value ? 'card' : 'div';
});
Expand Down

22 changes: 18 additions & 4 deletions
src/Fields/Field.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,7 +266,7 @@ public function shouldBeDuplicated()

 public function toPublishArray()
 {
return array_merge($this->preProcessedConfig(), [
$arr = array_merge($this->preProcessedConfig(), [
 'handle' => $this->handle,
 'prefix' => $this->prefix,
 'type' => $this->type(),
Expand All@@ -277,6 +277,23 @@ public function toPublishArray()
 'read_only' => $this->visibility() === 'read_only', // Deprecated: Addon fieldtypes should now reference new `visibility` state.
 'always_save' => $this->alwaysSave(),
 ]);

 $defaults = [
 ...self::commonFieldOptions()->all()->map->defaultValue()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ...$this->fieldtype()->configFields()->all()->map->defaultValue()->all(),
 ];

 // Return the array excluding keys where the value is the same as the default.
 return collect($arr)
 ->reject(fn ($value, $key) => array_key_exists($key, $defaults) && $value === $defaults[$key])
 ->all();

 return $arr;
 }

 public function setValue($value)
Expand DownExpand Up@@ -419,9 +436,6 @@ private function preProcessedConfig()
 self::commonFieldOptions()->all()->map->defaultValue()->all(),
 $this->config,
 $fields->preProcess()->values()->all(),
 [
 'component' => $fieldtype->component(),
 ]
 );
 }

Expand Down

13 changes: 8 additions & 5 deletions
src/Fields/Fieldtype.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,13 @@ public function setField(Field $field)
 return $this;
 }

 public function removeField()
 {
 $this->field = null;

 return $this;
 }

 public function field(): ?Field
 {
 return $this->field;
Expand DownExpand Up@@ -343,13 +350,9 @@ public function view()

 public function config(?string $key = null, $fallback = null)
 {
 if (! $this->field) {
 return $fallback;
 }

 $config = $this->configFields()->all()
 ->map->defaultValue()
 ->merge($this->field->config());
 ->merge($this->field?->config() ?? []);

 return $key
 ? ($config->get($key) ?? $fallback)
Expand Down

7 changes: 6 additions & 1 deletion
src/Fields/FieldtypeRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public function preloadable()
 public function find($handle)
 {
 if (isset($this->fieldtypes[$handle])) {
 return clone $this->fieldtypes[$handle];
 return (clone $this->fieldtypes[$handle])->removeField();
 }

 if (! ($fieldtypes = $this->classes())->has($handle)) {
Expand All@@ -39,6 +39,11 @@ public function handles()
 });
 }

 public function all()
 {
 return $this->handles()->map(fn ($handle) => $this->find($handle));
 }

 public function makeSelectableInForms($handle)
 {
 $this->selectableInForms[$handle] = true;
Expand Down

23 changes: 23 additions & 0 deletions
src/Http/View/Composers/JavascriptComposer.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,8 @@
use Statamic\Facades\Preference;
use Statamic\Facades\Site;
use Statamic\Facades\User;
use Statamic\Fields\Field;
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\Icon;
use Statamic\Statamic;
use Statamic\Support\Str;
Expand DownExpand Up@@ -74,6 +76,7 @@ private function protectedVariables()
 'hasLicenseBanner' => ! $licenses->outpostIsOffline() && ($licenses->invalid() || $licenses->requestFailed()),
 'customSvgIcons' => Icon::getCustomSvgIcons(),
 'commandPaletteCategories' => Category::order(),
 'fieldtypeConfigs' => $this->fieldtypeConfigs(),
 ];
 }

Expand DownExpand Up@@ -115,4 +118,24 @@ protected function translations(): array

 return array_merge($fallbackTranslations, $translations);
 }

 private function fieldtypeConfigs(): array
 {
 // TODO: Cache this.
 return [
 'common' => [
 ...Field::commonFieldOptions()->values()->all(),
 ...[
 'read_only' => false,
 'always_save' => false,
 'prefix' => null,
 ],
 ],
 'types' => FieldtypeRepository::all()
 ->mapWithKeys(fn (Fieldtype $fieldtype) => [$fieldtype->handle() => [
 ...$fieldtype->config(),
 ...['component' => $fieldtype->component()],
 ]])->all(),
 ];
 }
}
Loading