Skip to content
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

issue/2876 JSX version of text #57

Merged
merged 8 commits into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions js/TextModel.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import ComponentModel from 'core/js/models/componentModel';

export default class TextModel extends ComponentModel {}
30 changes: 30 additions & 0 deletions js/TextView.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import ComponentView from 'core/js/views/componentView';

class TextView extends ComponentView {

postRender() {
this.setReadyStatus();
this.setupInview();
}

setupInview() {
const selector = this.getInviewElementSelector();
if (!selector) return this.setCompletionStatus();
this.setupInviewCompletion(selector);
}

/**
* determines which element should be used for inview logic - body, instruction or title - and returns the selector for that element
*/
getInviewElementSelector() {
if (this.model.get('body')) return '.component__body';
if (this.model.get('instruction')) return '.component__instruction';
if (this.model.get('displayTitle')) return '.component__title';
return null;
}

}

TextView.template = 'text.jsx';

export default TextView;
62 changes: 6 additions & 56 deletions js/adapt-contrib-text.js
Original file line number Diff line number Diff line change
@@ -1,58 +1,8 @@
define([
'core/js/adapt',
'core/js/views/componentView',
'core/js/models/componentModel'
], function(Adapt, ComponentView, ComponentModel) {
import Adapt from 'core/js/adapt';
import TextView from './TextView';
import TextModel from './TextModel';

class TextView extends ComponentView {

preRender() {
this.checkIfResetOnRevisit();
}

postRender() {
this.setReadyStatus();

this.setupInview();
}

setupInview() {
const selector = this.getInviewElementSelector();
if (!selector) {
this.setCompletionStatus();
return;
}

this.setupInviewCompletion(selector);
}

/**
* determines which element should be used for inview logic - body, instruction or title - and returns the selector for that element
*/
getInviewElementSelector() {
if (this.model.get('body')) return '.component__body';

if (this.model.get('instruction')) return '.component__instruction';

if (this.model.get('displayTitle')) return '.component__title';

return null;
}

checkIfResetOnRevisit() {
const isResetOnRevisit = this.model.get('_isResetOnRevisit');

// If reset is enabled set defaults
if (isResetOnRevisit) {
this.model.reset(isResetOnRevisit);
}
}
}

TextView.template = 'text';

return Adapt.register('text', {
model: ComponentModel.extend({}),// create a new class in the inheritance chain so it can be extended per component type if necessary later
view: TextView
});
export default Adapt.register('text', {
This conversation was marked as resolved.
Show resolved Hide resolved
model: TextModel,
view: TextView
});
3 changes: 0 additions & 3 deletions templates/text.hbs

This file was deleted.

10 changes: 10 additions & 0 deletions templates/text.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import { templates } from 'core/js/reactHelpers';

export default function Text(props) {
return (
<div className="component__inner text__inner">
<templates.header {...props} />
</div>
);
}