-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Colour handling improvements #8702
base: master
Are you sure you want to change the base?
Conversation
The replacement library from https://colorjs.io/ is much, much larger but I think we can develop a custom build that uses treeshaking to whittle the code down to the bits that we need. @linonetwo does that sound feasible? I intend the explore further improvements but I wanted to start by establishing a library that can do modern P3 and OKLCH colour calculations.
Really just syntactic sugar for the wikify widget
Using the new wikify operator. Currently has a bug whereby redirected colours (like "tiddler-background") do not work. Direct colours like "background" do work. Note the hacks needed to makeFakeWidgetWithVariables work
Confirmed: Jermolene has already signed the Contributor License Agreement (see contributing.md) |
Is there a demo to test colour handling improvement? |
Hi @kookma I've posted a preview to tiddlyhost |
Thanks @springerspandrel
That should be fixed now.
The previews now show sidebar tabs in the appropriate colours.
That should be fixed now.
Both suggestions are now implemented.
That should be fixed now.
A block of code is an excellent idea.
I have included an alert in the latest update, but the challenge is that it obscures the title of the first tiddler. Perhaps previews need multiple pages to show things like alerts, notifications and modals. |
@@ -0,0 +1,94 @@ | |||
title: $:/PaletteEditor |
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.
Indentation please.
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.
Just to be clear, this file hasn't been changed (yet), it is just moved from $:/PaletteManager
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.
ah ok
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.
I meant to add that this file needs substantial revision so I will add indentation when I do that.
@@ -3,8 +3,9 @@ tags: $:/tags/Macro | |||
|
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.
tags: $:/tags/Global is missing
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.
Hi @pmario all the core macros use $:/tags/Macro
rather than $:/tags/Global
. I think we kept it that way to be super cautious about backwards compatibility. We can discuss changing them, but they should all be changed at the same time.
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.
IMO we should use $:/tags/Global
for newly introduced core macros,widgets and functions, while $:/tags/Macro
for old core macros.
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.
IMO we should use
$:/tags/Global
for newly introduced core macros,widgets and functions, while$:/tags/Macro
for old core macros.
That's reasonable. $:/core/macros/CSS
is of course old, but I may do further refactoring of this PR.
@Jermolene .. Am I right, that palettes are becoming a "description" how they should be "consolidated" and that they can be chained. Is this PR ready to be tested or should I wait? |
I wouldn't think of it that way. The consolidation process is just part of the implementation of the palette import process. It's not strictly necessary but it's helpful for debugging to be able to see the final values that were used to compose the palette.
Do you mean should you click through to the demo? It's probably hard to assess this PR without trying out the demo. It is still a draft, and there's more to do. |
|
||
BackgroundActionDispatcher.prototype.trackFilter = function(title) { | ||
var tiddler = this.wiki.getTiddler(title), | ||
id = this.nextTrackedFilterId++, |
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.
I think this counter this.nextTrackedFilterId
should be named this.nextTrackedFilterIdx
... Idx
for index or Cnt
for counter. Just a thought. I did not single step the function yet
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.
Thanks @pmario. These ids are intended to be opaque to client code; there is no semantics in incrementing or decrementing them, they're just used as an identifier.
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.
ok
core/modules/background-actions.js
Outdated
this.wiki = options.wiki; | ||
this.title = options.title; | ||
this.trackFilter = options.trackFilter; | ||
this.actions = options.actions |
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.
semicolon missing at line end?
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.
Thanks @pmario
core/wiki/macros/tag.tid
Outdated
@@ -28,15 +28,15 @@ color:$(foregroundColor)$; | |||
</$let> | |||
\end | |||
|
|||
\define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions) | |||
\define tag-pill-body(tag,icon,colour,element-tag,element-attributes,actions) |
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.
hmm, IMO we can not change this macro signature because of backwards compatibility reasons.
In the docs we need to deprecate the parameter.
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.
Thanks @pmario
core/wiki/paletteswitcher.tid
Outdated
|
||
<$linkcatcher actions=<<actions>>> | ||
<div class={{{ tc-chooser [<thumbnails>match[yes]then[tc-chooser-cards]] +[join[ ]] }}}> | ||
<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[name]]"> |
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.
One minor thing I noticed is that the palette switcher shows any draft versions of palettes, in addition to the actual saved palettes. (This is actually present in the current version too, but there it could plausibly be almost useful if you were trying to edit a palette with the regular tiddler editor and see the changes live. That doesn't work with the new compilation system, though.)
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.
I did the following tests using Windows 11 pro, FireFox 135
|
Thanks for trying things out @pmario.
Weird. The preview is showing thumbnails, but
The fact that the styling in |
These are mostly RGB entries that were previously missing, filled in with values from Vanilla. The goal is still not to have any direct RGB colours in the palette, just computed colours derived from the base colours
Makes debugging easier, and works in CSS and as a style.prop assignment
button-border: | ||
button-background: | ||
button-border: | ||
button-foreground: |
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.
Do we need spaces here?
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.
I intend to fill in those entries later.
@@ -76,7 +78,7 @@ dropdown-background: [tf.colour[background]] | |||
dropdown-border: [tf.colour[muted-foreground]] | |||
dropdown-tab-background-selected: [tf.colour[background]] | |||
dropdown-tab-background: [tf.interpolate-colours[base-paper],[base-ink],[0.9]] | |||
dropzone-background: rgba(0,200,0,0.7) | |||
dropzone-background: [tf.colour[base-secondary]colour-set-alpha[0.7]] |
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.
I do like this possibility: [tf.colour[base-secondary]colour-set-alpha[0.7]]
but once the "alpha" values are settled, would it be possible to have eg: colour-set-alpha<lighter>
, colour-set-alpha<lighter>
colour-set-alpha<lightest>
and eg: dark, darker, darkest -- What do you think?
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.
In the same realm. I know colour-set-alpha
is the right technical term, but our users would probably prefer darken-colour<percent>
Question Does "alpha" set transparency or does it calculate a lighter or darker colour?
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.
Hi @pmario to darken a colour one would use colour-set-oklch:l[0.5]
to set the lightness.
We don't yet have operators to extract the components of a colour in a particular colour space, but once we have those then it would be possible to make macros for setting the alpha or brightness in relative steps.
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.
Question Does "alpha" set transparency or does it calculate a lighter or darker colour?
Apologies, to be clear it sets transparency
Introduction
This PR brings several new features for end users:
There are also new capabilities for palette authors:
To make all of these new features possible, this PR also includes some useful new general purpose mechanisms and features:
$:/info/...
tiddlerchangecount
filter operator:apply
filter run prefixTry the Demo
A preview build is available at https://deploy-preview-8702--tiddlywiki-previews.netlify.app/
Changes to Palettes
Palette entries are now defined as filters that must be evaluated, rather than wikitext that must be wikified.
This makes it possible to create palettes that reference and modify other colours. For example:
Retrospectively re-interpreting palettes entries as filters would normally mean that
<<colour background>>
would no longer work. Instead these entries are automatically converted to the updated form[function[colour],[background]]
.Palette Compilation
The key idea underpinning these changes is a fundamental change to the way that TiddlyWiki handles palettes. At the moment, palette entries are named items that can contain either a CSS colour string, a CSS colour token like "inherit", or can use the
<<colour>>
macro to reference another colour palette entry. Thus, palette entries have to be wikified before they can be used. This has turned out to be very limiting and doesn't provide a viable path to the complex colour manipulations shown above. Switching to filters might make things worse, by encouraging authors to use complex expressions within palettes.The fix is compiled palettes: at the point of switching to a new palette, the colours within it are "compiled" to raw CSS colour values (typically but not necessarily in
#rrggbbaa
format). This allows palette entries to be used directly, without the requirement to wikify them.The static palette is created in a new system tiddler
$:/temp/palette-colours
by an action procedure that is invoked at startup and when switching to a new palette.There should not be any backwards compatibility issues because the use of background actions means that any code that changes
$:/palette
will automatically trigger the recompilation of the palette.This change also allows us to change the
<<colour>>
procedure to be a function, which allows it to be used as the value for a style attribute:Automatic Palette Readability Tests
Palettes can opt to include readability tests as special palette entries. The results of these tests are shown at the bottom of the palette chooser. For example:
The test framework looks for palette entries starting with a question mark and runs the associated filters. The filter should return nothing if there are no errors, or a textual error message if the conditions are violated. Sample output:
Colour Manipulation
We need a colour manipulation library that can calculate variants of colours. Only color.js met the requirements of being able to work with P3 colours and the OKLCH colour space. It also includes a CSS colour string parser which can replace the simple one that TiddlyWiki has always incorporated.
Media Query Tracker
The CSS media query tracker allows a media query to be bound to an info tiddler so that the current state of the query is reflected in the value of the tiddler. The value is updated dynamically.
The use of the info mechanism for the CSS media query tracker means that these tiddlers are dynamically created as shadow tiddlers within the
$:/temp/info
plugin, and so do not appear in tiddler lists.The mechanism is used to implement the existing dark mode tiddler with the following configuration:
Note the use of
info-tiddler-alt
to specify a redundant secondary info tiddler. This is used by the dark mode tracker to maintain compatibility while changing the info tiddler title for consistency.Background Actions
The new background actions mechanism allows action strings to be invoked automatically in the background whenever the results of a filter change.
The preview includes a demonstration background action that displays an alert with a list of tiddlers in the story river whenever the story river changes:
apply
Filter Run PrefixAn experimental new filter run prefix that makes it possible to use computed values as variables within a filter run. For example:
Backwards Compatibility
$:/config/DefaultColourMappings/
now only supports CSS colours, and not indirections via<<colour X>>
or[function[colour],[X]]
References
Progress
changecount
operatorcolour-interpolate
operatorcolour-lighten
operatorcolour-darken
operatorcolour-get-oklch
operatorcolour-set-oklch
operatorcolour-contrast
operatorcolour-best-contrast
operator