-
Notifications
You must be signed in to change notification settings - Fork 9
Refactor: Component based PHP rendering #673
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.
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
base: theme-elementary-v2
Are you sure you want to change the base?
Changes from all commits
dc092e3
fd4b542
c60aa58
4512e3a
223b9ab
961f624
18b7098
8641cd9
9b3ae81
a4feb94
beb73b1
95e33c4
28da679
333b541
fb50d2c
e3384fd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
|
aryanjasala marked this conversation as resolved.
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,6 +100,8 @@ | |
| </property> | ||
| </properties> | ||
| <exclude-pattern>tests/bootstrap.php</exclude-pattern> | ||
| <!-- Component partials are always require'd inside ComponentLoader::render(), so variables are method-scoped at runtime. --> | ||
| <exclude-pattern>src/components/*</exclude-pattern> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This |
||
| </rule> | ||
|
|
||
| <rule ref="WordPress-Docs"> | ||
|
|
@@ -112,6 +114,8 @@ | |
|
|
||
| <rule ref="WordPress.WP.GlobalVariablesOverride.Prohibited"> | ||
| <exclude-pattern>tests/*</exclude-pattern> | ||
| <!-- Component partials are always require'd inside ComponentLoader::render(), so variables are method-scoped at runtime. --> | ||
| <exclude-pattern>src/components/*</exclude-pattern> | ||
| </rule> | ||
|
|
||
| <!-- | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /** | ||
| * Button component script. | ||
| */ | ||
| document.addEventListener('DOMContentLoaded', () => { | ||
| const buttons = document.querySelectorAll('.elementary-button'); | ||
| if (buttons.length > 0) { | ||
| console.log(`Elementary Button component loaded. Found ${buttons.length} buttons.`); | ||
| } | ||
| }); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <?php | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. declare( strict_types = 1 ); |
||
| /** | ||
| * Button component. | ||
| * | ||
| * A render-only component that outputs a button or link element. | ||
| * | ||
| * @package rtCamp\Theme\Elementary | ||
| * | ||
| * @param array $args { | ||
| * Component arguments. | ||
| * | ||
| * @type string $label Button label text. Required. | ||
| * @type string $url URL for link buttons. Optional. | ||
| * @type string $class Additional CSS classes. Optional. | ||
| * @type string $tag HTML tag: 'a' or 'button'. Optional. Defaults to 'a' when $url is set, 'button' otherwise. | ||
| * } | ||
| */ | ||
|
|
||
| $label = $args['label'] ?? ''; | ||
| $url = $args['url'] ?? ''; | ||
| $class = $args['class'] ?? ''; | ||
| $tag = $args['tag'] ?? ( ! empty( $url ) ? 'a' : 'button' ); | ||
|
|
||
| if ( empty( $label ) ) { | ||
| return; | ||
| } | ||
|
|
||
| $css_class = trim( 'elementary-button ' . $class ); | ||
|
|
||
| if ( 'a' === $tag && ! empty( $url ) ) { | ||
| printf( | ||
| '<a href="%s" class="%s">%s</a>', | ||
| esc_url( $url ), | ||
| esc_attr( $css_class ), | ||
| esc_html( $label ) | ||
| ); | ||
| } else { | ||
| printf( | ||
| '<button type="button" class="%s">%s</button>', | ||
| esc_attr( $css_class ), | ||
| esc_html( $label ) | ||
| ); | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| .elementary-button { | ||
| display: inline-flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| padding: 0.75rem 1.5rem; | ||
| font-size: 1rem; | ||
| font-weight: 500; | ||
| line-height: 1.5; | ||
| color: #fff; | ||
| background-color: #0073aa; | ||
| border: 1px solid transparent; | ||
| border-radius: 4px; | ||
| text-decoration: none; | ||
| cursor: pointer; | ||
| transition: background-color 0.2s ease-in-out; | ||
|
|
||
| &:hover, | ||
| &:focus { | ||
| background-color: #005177; | ||
| text-decoration: none; | ||
| color: #fff; | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /** | ||
| * Card component script. | ||
| */ | ||
| document.addEventListener('DOMContentLoaded', () => { | ||
| const cards = document.querySelectorAll('.elementary-card'); | ||
| if (cards.length > 0) { | ||
| console.log(`Elementary Card component loaded. Found ${cards.length} cards.`); | ||
| } | ||
| }); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?php | ||
| /** | ||
| * Card component. | ||
| * | ||
| * A render-only component that outputs a card with optional image, title, | ||
| * description, and action button. Demonstrates component composability | ||
| * by rendering the Button component internally. | ||
| * | ||
| * @package rtCamp\Theme\Elementary | ||
| * | ||
| * @param array $args { | ||
| * Component arguments. | ||
| * | ||
| * @type string $title Card title. Required. | ||
| * @type string $description Card description text. Optional. | ||
| * @type string $image_url Card image URL. Optional. | ||
| * @type string $url Card link URL. Optional. | ||
| * } | ||
| */ | ||
|
|
||
| use rtCamp\Theme\Elementary\Framework\ComponentLoader; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Component partials are meant to be pure render files — they should not import the class that executes them. This If Card needs to render Button, it can call the global wrapper |
||
|
|
||
| $title = $args['title'] ?? ''; | ||
| $description = $args['description'] ?? ''; | ||
| $image_url = $args['image_url'] ?? ''; | ||
| $url = $args['url'] ?? ''; | ||
|
|
||
| if ( empty( $title ) ) { | ||
| return; | ||
| } | ||
|
|
||
| ?> | ||
| <div class="elementary-card"> | ||
| <?php if ( ! empty( $image_url ) ) : ?> | ||
| <div class="elementary-card__image"> | ||
| <img src="<?php echo esc_url( $image_url ); ?>" alt="<?php echo esc_attr( $title ); ?>" /> | ||
| </div> | ||
| <?php endif; ?> | ||
|
|
||
| <div class="elementary-card__content"> | ||
| <h3 class="elementary-card__title"><?php echo esc_html( $title ); ?></h3> | ||
|
|
||
| <?php if ( ! empty( $description ) ) : ?> | ||
| <p class="elementary-card__description"><?php echo esc_html( $description ); ?></p> | ||
| <?php endif; ?> | ||
|
|
||
| <?php if ( ! empty( $url ) ) : ?> | ||
| <div class="elementary-card__action"> | ||
| <?php | ||
| ComponentLoader::render( | ||
| 'Button', | ||
| [ | ||
| 'label' => $title, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nested component does not forward Card renders Button with no Forward relevant options: ComponentLoader::render( 'Button', $button_args, array_intersect_key( $options, array_flip( [ 'script', 'style' ] ) ) );Note: |
||
| 'url' => $url, | ||
| 'class' => 'elementary-card__button', | ||
| ] | ||
| ); | ||
| ?> | ||
| </div> | ||
| <?php endif; ?> | ||
| </div> | ||
| </div> | ||
| <?php | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| .elementary-card { | ||
| display: flex; | ||
| flex-direction: column; | ||
| background-color: #fff; | ||
| border: 1px solid #e2e8f0; | ||
| border-radius: 8px; | ||
| overflow: hidden; | ||
| box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); | ||
| transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out; | ||
|
|
||
| &:hover { | ||
| transform: translateY(-4px); | ||
| box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); | ||
| } | ||
|
|
||
| &__image { | ||
| width: 100%; | ||
| height: 200px; | ||
| overflow: hidden; | ||
|
|
||
| img { | ||
| width: 100%; | ||
| height: 100%; | ||
| object-fit: cover; | ||
| } | ||
| } | ||
|
|
||
| &__content { | ||
| padding: 1.5rem; | ||
| display: flex; | ||
| flex-direction: column; | ||
| flex-grow: 1; | ||
| } | ||
|
|
||
| &__title { | ||
| font-size: 1.25rem; | ||
| font-weight: 600; | ||
| margin: 0 0 0.75rem; | ||
| color: #1a202c; | ||
| } | ||
|
|
||
| &__description { | ||
| font-size: 1rem; | ||
| color: #4a5568; | ||
| margin: 0 0 1.5rem; | ||
| line-height: 1.5; | ||
| flex-grow: 1; | ||
| } | ||
|
|
||
| &__action { | ||
| margin-top: auto; | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the new refactor, we might want to make this class a shared instance, and during initiation we might want to set the default component directory in a variable, so that it doesn't need to be added again and again later - as this would be inside framework now and framework would be added via composer.