Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Formatting date time editor

Browse Source 
Summary: Formatting date and datetime editor. Changing styles for Timezone, DateFormat and TimeFormat section.

Test Plan: Existing tests

Reviewers: georgegevoian, dsagal

Reviewed By: georgegevoian, dsagal

Subscribers: dsagal

Differential Revision: https://phab.getgrist.com/D2899
This commit is contained in:
Jarosław Sadziński
2021-07-08 09:29:30 +02:00
parent 5d461a4df2
commit 09b4aaa90e
2 changed files with 118 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/client/widgets/DateTextBox.js
View File

@@ -8,7 +8,10 @@ var AbstractWidget = require('./AbstractWidget');
const {fromKoSave} = require('app/client/lib/fromKoSave');
const {alignmentSelect} = require('app/client/ui2018/buttonSelect');
const {cssRow} = require('app/client/ui/RightPanel');
const {cssRow, cssLabel} = require('app/client/ui/RightPanel');
const {cssTextInput} = require("app/client/ui2018/editableLabel");
const {styled, fromKo} = require('grainjs');
const {select} = require('app/client/ui2018/menus');
/**
* DateTextBox - The most basic widget for displaying simple date information.
@@ -54,13 +57,10 @@ _.extend(DateTextBox.prototype, AbstractWidget.prototype);
DateTextBox.prototype.buildDateConfigDom = function() {
var self = this;
return dom('div',
kf.row(
1, dom('div.glyphicon.glyphicon-calendar.config_icon'),
8, kf.label('Date Format'),
9, dom(kf.select(self.standardDateFormat, self.dateFormatOptions), dom.testId("Widget_dateFormat"))
),
cssLabel("Date Format"),
cssRow(dom(select(fromKo(self.standardDateFormat), self.dateFormatOptions), dom.testId("Widget_dateFormat"))),
kd.maybe(self.isCustomDateFormat, function() {
return dom(kf.text(self.dateFormat), dom.testId("Widget_dateCustomFormat"));
return cssRow(dom(textbox(self.dateFormat), dom.testId("Widget_dateCustomFormat")));
})
);
};
@@ -86,4 +86,33 @@ DateTextBox.prototype.buildDom = function(row) {
);
};
// clean up old koform styles
const cssClean = styled('div', `
flex: 1;
margin: 0px;
`)
// override focus - to look like modern ui
const cssFocus = styled('div', `
&:focus {
outline: none;
box-shadow: 0 0 3px 2px var(--grist-color-cursor);
border: 1px solid transparent;
}
`)
// helper method to create old style textbox that looks like a new one
function textbox(value) {
const textDom = kf.text(value);
const tzInput = textDom.querySelector('input');
dom(tzInput,
kd.cssClass(cssTextInput.className),
kd.cssClass(cssFocus.className)
);
dom(textDom,
kd.cssClass(cssClean.className)
);
return textDom;
}
module.exports = DateTextBox;