Skip to content

Commit

Permalink
fix(InlineContent): uncomments accidental merged properties (#520)
Browse files Browse the repository at this point in the history
* fix(InlineContent): removes stories and uncomments properties that were accidentally merged

* fix(InlineContent): remoces textbox import in story
slhay28 authored Jun 18, 2024
1 parent 1185bf0 commit 0786fa5
Showing 1 changed file with 1 addition and 39 deletions.
Original file line number Diff line number Diff line change
@@ -20,18 +20,13 @@ import lng from '@lightningjs/core';
import { default as InlineContentComponent } from '.';
import lightningbolt from '../../assets/images/ic_lightning_white_32.png';
import { getHexColor } from '../../utils';
import TextBox from '../TextBox';

const lorum =
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum sodales est eu eleifend interdum. Vivamus egestas maximus elementum. Sed condimentum ligula justo, non sollicitudin lectus rutrum vel. Integer iaculis vitae nisl quis tincidunt. Sed quis dui vehicula, vehicula felis a, tempor leo. Fusce tincidunt, ante eget pretium efficitur, libero elit volutpat quam, sit amet porta tortor odio non ligula. Ut sed dolor eleifend massa auctor porttitor eget ut lectus. Vivamus elementum lorem mauris, eu luctus tortor posuere sit amet. Nunc a interdum metus.';

export default {
title: 'Components/InlineContent',
args: {
contentWrap: false,
justify: 'center',
// Commented out for testing purposes. READD BEFORE MERGE
// contentProperties: { marginBottom: -4 } Commented out for testing purposes. READD BEFORE MERGE
contentProperties: { marginBottom: -4 },
maxLines: 0,
maxLinesSuffix: '..'
},
@@ -236,36 +231,3 @@ WithTruncation.args = {
maxLines: 2,
maxLinesSuffix: '...'
};

// ADDED FOR TESTING PURPOSES, REMOVE BEFORE MERGE
export const TextBoxVSInlineContent = args =>
class TextBoxVSInlineContent extends lng.Component {
static _template() {
return {
InlineContent: {
type: InlineContentComponent,
...args,
w: 600,
content: lorum,
marquee: false,
hideOnLoad: false,
fixed: true
},
Textbox: {
type: TextBox,
fixed: true,
x: 601,
w: 600,
style: { textStyle: { maxLines: 3 }, offsetY: 0 },
marquee: false,
content: lorum,
hideOnLoad: false,
contentWrap: true
}
};
}
};
TextBoxVSInlineContent.args = {
contentWrap: true,
maxLines: 3
};

0 comments on commit 0786fa5

Please sign in to comment.